From 1baac59e0cea8985a60093e7415a1796bad138ae Mon Sep 17 00:00:00 2001 From: John Hodge Date: Fri, 6 Jan 2012 20:49:41 +0800 Subject: [PATCH] Misc fiddling to ARMv7 for trimslice builds --- Kernel/arch/armv7/Makefile | 2 +- Kernel/arch/armv7/start.S | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Kernel/arch/armv7/Makefile b/Kernel/arch/armv7/Makefile index 214137a3..1bb9496d 100644 --- a/Kernel/arch/armv7/Makefile +++ b/Kernel/arch/armv7/Makefile @@ -13,6 +13,6 @@ LDFLAGS += `$(CC) --print-libgcc-file-name` A_OBJ = start.ao main.o lib.o lib.ao time.o pci.o debug.o A_OBJ += mm_phys.o mm_virt.o proc.o proc.ao -main.c: Makefile.BuildNum.$(ARCH) +#main.c: Makefile.BuildNum.$(ARCH) POSTBUILD = objcopy $(BIN) -F binary $(BIN) diff --git a/Kernel/arch/armv7/start.S b/Kernel/arch/armv7/start.S index da57360b..817dca1f 100644 --- a/Kernel/arch/armv7/start.S +++ b/Kernel/arch/armv7/start.S @@ -18,6 +18,10 @@ ivt_fiq: b . @ 0x1C FIQ (Fast interrupt) .globl _start _start: + ldr r0, =DEBUG_UART_PADDR + ldr r1, 'A' + str r0, r1 + ldr r0, =kernel_table0-KERNEL_BASE mcr p15, 0, r0, c2, c0, 1 @ Set TTBR1 to r0 mcr p15, 0, r0, c2, c0, 0 @ Set TTBR0 to r0 too (for identity) @@ -305,3 +309,5 @@ kernel_exception_map: stack: .space MM_KSTACK_SIZE, 0 @ Original kernel stack +; vim: ts=8, ft=armv7 + -- 2.20.1