diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-03-26 20:40:36 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-13 14:15:15 -0700 |
| commit | 5252ed95204bdf55bec5a90ea69860bf2f78c643 (patch) | |
| tree | 191e19a29fa0700987c9ab63cc69d16db3006c34 /cpu/arm1136/cpu.c | |
| parent | 1f1d88dd40815332df32982e739f2ddd2da6fe1a (diff) | |
| download | talos-obmc-uboot-5252ed95204bdf55bec5a90ea69860bf2f78c643.tar.gz talos-obmc-uboot-5252ed95204bdf55bec5a90ea69860bf2f78c643.zip | |
Separate omap24xx specific code from arm1136
Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm1136
to cpu/arm1136/omap24xx.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Diffstat (limited to 'cpu/arm1136/cpu.c')
| -rw-r--r-- | cpu/arm1136/cpu.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpu/arm1136/cpu.c b/cpu/arm1136/cpu.c index fa78eaa7f0..c27f8cd58c 100644 --- a/cpu/arm1136/cpu.c +++ b/cpu/arm1136/cpu.c @@ -33,9 +33,6 @@ #include <common.h> #include <command.h> -#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR) -#include <asm/arch/omap2420.h> -#endif #ifdef CONFIG_USE_IRQ DECLARE_GLOBAL_DATA_PTR; @@ -47,10 +44,10 @@ static unsigned long read_p15_c1 (void) unsigned long value; __asm__ __volatile__( - "mrc p15, 0, %0, c1, c0, 0 @ read control reg\n" - : "=r" (value) - : - : "memory"); + "mrc p15, 0, %0, c1, c0, 0 @ read control reg\n" + : "=r" (value) + : + : "memory"); return value; } |
