diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-03-30 11:28:46 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2008-03-30 11:28:46 +0100 |
| commit | 8bf69d81782619187933a605f1a95ee1d069478d (patch) | |
| tree | 100ef560ad420c1513514a228aba8499890c9c1d /cpu/arm1136/cpu.c | |
| parent | 8c16cb0d3b971f46fbe77c072664c0f2dcd4471d (diff) | |
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 fa78eaa7f..90e955303 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; } |