diff options
author | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
commit | 41341221d12341a2ecfb280142d6478071738fc2 (patch) | |
tree | 850a87b274b572b65a579474a0aad5e590ca6d61 /arch/arm/lib | |
parent | b7ab8b8ff092ab8214eeb86e8a79573154f448b9 (diff) | |
parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR
Conflicts:
arch/arm/include/asm/arch-omap5/omap.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/lib')
-rw-r--r-- | arch/arm/lib/cache.c | 2 | ||||
-rw-r--r-- | arch/arm/lib/crt0.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index b545fb79bc1..8b1c8ed4bfc 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -27,7 +27,7 @@ void __flush_cache(unsigned long start, unsigned long size) { -#if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136) +#if defined(CONFIG_ARM1136) void arm1136_cache_flush(void); arm1136_cache_flush(); diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index a9657d190f3..a5bffb8da6d 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -97,13 +97,13 @@ ENTRY(_main) * 'here' but relocated. */ - ldr sp, [r8, #GD_START_ADDR_SP] /* r8 = gd->start_addr_sp */ + ldr sp, [r8, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ ldr r8, [r8, #GD_BD] /* r8 = gd->bd */ sub r8, r8, #GD_SIZE /* new GD is below bd */ adr lr, here - ldr r0, [r8, #GD_RELOC_OFF] /* lr = gd->start_addr_sp */ + ldr r0, [r8, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ add lr, lr, r0 ldr r0, [r8, #GD_RELOCADDR] /* r0 = gd->relocaddr */ b relocate_code |