diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-09-05 14:37:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-09-07 21:46:39 +0200 |
| commit | c8f63b415fc7c53550fd613ed94e3d5dddf76d6f (patch) | |
| tree | c77fd9d80306cf86b0ca2ffab4e986a0bfb9dd15 /arch | |
| parent | fc5e5ceec4937773072a242cbef7a0f1e7db99e0 (diff) | |
| download | u-boot-imx-c8f63b415fc7c53550fd613ed94e3d5dddf76d6f.zip u-boot-imx-c8f63b415fc7c53550fd613ed94e3d5dddf76d6f.tar.gz u-boot-imx-c8f63b415fc7c53550fd613ed94e3d5dddf76d6f.tar.bz2 | |
ARM: remove broken "ep7312" board.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Marius Gröger <mag@sysgo.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/arm720t/cpu.c | 6 | ||||
| -rw-r--r-- | arch/arm/cpu/arm720t/interrupts.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm720t/start.S | 6 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-arm720t/hardware.h | 4 |
4 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c index ff992aa..71d8d6b 100644 --- a/arch/arm/cpu/arm720t/cpu.c +++ b/arch/arm/cpu/arm720t/cpu.c @@ -36,7 +36,7 @@ #include <asm/hardware.h> #include <asm/system.h> -#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO) +#if defined(CONFIG_IMPA7) static void cache_flush(void); #endif @@ -50,7 +50,7 @@ int cleanup_before_linux (void) * and we set the CPU-speed to 73 MHz - see start.S for details */ -#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO) +#if defined(CONFIG_IMPA7) disable_interrupts (); /* turn off I-cache */ @@ -74,7 +74,7 @@ int cleanup_before_linux (void) return 0; } -#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO) +#if defined(CONFIG_IMPA7) /* flush I/D-cache */ static void cache_flush (void) { diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c index fa9c5a2..3cebf11 100644 --- a/arch/arm/cpu/arm720t/interrupts.c +++ b/arch/arm/cpu/arm720t/interrupts.c @@ -149,7 +149,7 @@ int timer_init (void) /* set timer 2 counter */ lastdec = TIMER_LOAD_VAL; -#elif defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO) +#elif defined(CONFIG_IMPA7) /* disable all interrupts */ IO_INTMR1 = 0; @@ -207,7 +207,7 @@ int timer_init (void) */ -#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_NETARM) || defined(CONFIG_ARMADILLO) || defined(CONFIG_LPC2292) +#if defined(CONFIG_IMPA7) || defined(CONFIG_NETARM) || defined(CONFIG_LPC2292) ulong get_timer (ulong base) { diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index e9a094f..f2320ee 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -272,7 +272,7 @@ _dynsym_start_ofs: ************************************************************************* */ -#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO) +#if defined(CONFIG_IMPA7) /* Interrupt-Controller base addresses */ INTMR1: .word 0x80000280 @ 32 bit size @@ -301,7 +301,7 @@ MEMMAP_ADR: .word MEMMAP #endif cpu_init_crit: -#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO) +#if defined(CONFIG_IMPA7) /* * mask all IRQs by clearing all bits in the INTMRs @@ -634,7 +634,7 @@ fiq: #endif -#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO) +#if defined(CONFIG_IMPA7) .align 5 .globl reset_cpu reset_cpu: diff --git a/arch/arm/include/asm/arch-arm720t/hardware.h b/arch/arm/include/asm/arch-arm720t/hardware.h index 9bee19f..d89effa 100644 --- a/arch/arm/include/asm/arch-arm720t/hardware.h +++ b/arch/arm/include/asm/arch-arm720t/hardware.h @@ -28,10 +28,6 @@ #include <asm/arch-arm720t/netarm_registers.h> #elif defined(CONFIG_IMPA7) /* include IMPA7 specific hardware file if there was one */ -#elif defined(CONFIG_EP7312) -/* include EP7312 specific hardware file if there was one */ -#elif defined(CONFIG_ARMADILLO) -/* include armadillo specific hardware file if there was one */ #elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR) /* include IntegratorCP/CM720T specific hardware file if there was one */ #else |