diff options
| -rw-r--r-- | arch/arm/Makefile | 8 | ||||
| -rw-r--r-- | arch/arm/cpu/cpu.c | 9 | ||||
| -rw-r--r-- | arch/arm/cpu/interrupts.c | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/start-arm920t.S (renamed from cpu/arm920t/start.S) | 0 | ||||
| -rw-r--r-- | board/scb9328/u-boot.lds.S | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6f6b3ea2b9..a6825c3f0e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -49,12 +49,12 @@ BOARD := endif ifneq ($(cpu-y),) -CPU := cpu/$(cpu-y)/ +MACH := arch/arm/mach-$(machine-y)/ else -CPU := +MACH := endif -common-y += $(BOARD) $(CPU) -common-y += arch/arm/lib/ +common-y += $(BOARD) $(MACH) +common-y += arch/arm/lib/ arch/arm/cpu/ MRPROPER_FILES += include/asm-arm/arch diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c index 2e77db994b..bf0c163d08 100644 --- a/arch/arm/cpu/cpu.c +++ b/arch/arm/cpu/cpu.c @@ -1,3 +1,6 @@ +#include <common.h> +#include <command.h> + /* read co-processor 15, register #1 (control register) */ static unsigned long read_p15_c1 (void) { @@ -72,6 +75,8 @@ int icache_status (void) int cleanup_before_linux (void) { + int i; + /* * this function is called just before we call linux * it prepares the processor for linux @@ -107,8 +112,8 @@ core_initcall(cpu_init); int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - disable_interrupts (); - reset_cpu 0; + disable_interrupts(); + reset_cpu(0); /* NOT REACHED */ return 0; diff --git a/arch/arm/cpu/interrupts.c b/arch/arm/cpu/interrupts.c index bfb7c53210..2d0bb7d589 100644 --- a/arch/arm/cpu/interrupts.c +++ b/arch/arm/cpu/interrupts.c @@ -1,3 +1,4 @@ +#include <common.h> #ifdef CONFIG_USE_IRQ /* enable IRQ interrupts */ diff --git a/cpu/arm920t/start.S b/arch/arm/cpu/start-arm920t.S index 596f0b4672..596f0b4672 100644 --- a/cpu/arm920t/start.S +++ b/arch/arm/cpu/start-arm920t.S diff --git a/board/scb9328/u-boot.lds.S b/board/scb9328/u-boot.lds.S index 0080ec92da..0aab52d356 100644 --- a/board/scb9328/u-boot.lds.S +++ b/board/scb9328/u-boot.lds.S @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm920t/start.o (.text) + arch/arm/cpu/start-arm920t.o (.text) *(.text) } |