diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-11 15:11:26 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-11 15:11:26 +0200 |
| commit | 950a392464e616b4590bc4501be46e2d7d162dea (patch) | |
| tree | e33be5df8d39072af358f9e1febad383714cccc7 /cpu/arm1136/cpu.c | |
| parent | aeff6d503b6006573d5c6b04fc658a64bebee5fa (diff) | |
| download | u-boot-imx-950a392464e616b4590bc4501be46e2d7d162dea.zip u-boot-imx-950a392464e616b4590bc4501be46e2d7d162dea.tar.gz u-boot-imx-950a392464e616b4590bc4501be46e2d7d162dea.tar.bz2 | |
Revert merge of git://www.denx.de/git/u-boot-arm, commit 62479b18:
Reverting became necessary after it turned out that the patches in
the u-boot-arm repo were modified, and in some cases corrupted.
This reverts the following commits:
066bebd6353e33af3adefc3404560871699e9961
7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6
c88ae20580b2b01487b4cdcc8b2a113f551aee36
a147e56f03871bba4f05058d5e04ce7deb010b04
d6674e0e2a6a1f033945f78838566210d3f28c95
8c8463cce44d849e37744749b32d38e1dfb12e50
c98b47ad24b2d91f41c09a3d62d7f70ad84f4b7d
8bf69d81782619187933a605f1a95ee1d069478d
8c16cb0d3b971f46fbe77c072664c0f2dcd4471d
a574a73852a527779234e73e17e7597fd8128882
1377b5583a48021d983e1fd565f7d40c89e84d63
1704dc20917b4f71e373e2c888497ee666d40380
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/arm1136/cpu.c')
| -rw-r--r-- | cpu/arm1136/cpu.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cpu/arm1136/cpu.c b/cpu/arm1136/cpu.c index 90e9553..fa78eaa 100644 --- a/cpu/arm1136/cpu.c +++ b/cpu/arm1136/cpu.c @@ -33,6 +33,9 @@ #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; @@ -44,10 +47,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; } |