summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/start.S
diff options
context:
space:
mode:
authorAneesh V <aneesh@ti.com>2011-07-13 05:11:07 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 14:44:34 +0200
commit401bb30b6d5ee18642e95086af51e39de454bd30 (patch)
tree9004be3d53e0cdba8eae3e9ad93e574642552dde /arch/arm/cpu/armv7/start.S
parent05bad4aa567ccffaac128d9090abde245f8463d1 (diff)
downloadblackbird-obmc-uboot-401bb30b6d5ee18642e95086af51e39de454bd30.tar.gz
blackbird-obmc-uboot-401bb30b6d5ee18642e95086af51e39de454bd30.zip
replace CONFIG_PRELOADER with CONFIG_SPL_BUILD
replace all occurences of CONFIG_PRELOADER with CONFIG_SPL_BUILD Signed-off-by: Aneesh V <aneesh@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/start.S')
-rw-r--r--arch/arm/cpu/armv7/start.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index eee648bdc4..5c87e9c333 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -182,7 +182,7 @@ stack_setup:
mov sp, r4
adr r0, _start
-#ifndef CONFIG_PRELOADER
+#ifndef CONFIG_SPL_BUILD
cmp r0, r6
beq clear_bss /* skip relocation */
#endif
@@ -196,7 +196,7 @@ copy_loop:
cmp r0, r2 /* until source end address [r2] */
blo copy_loop
-#ifndef CONFIG_PRELOADER
+#ifndef CONFIG_SPL_BUILD
/*
* fix .rel.dyn relocations
*/
@@ -248,7 +248,7 @@ clbss_l:str r2, [r0] /* clear loop... */
add r0, r0, #4
cmp r0, r1
bne clbss_l
-#endif /* #ifndef CONFIG_PRELOADER */
+#endif /* #ifndef CONFIG_SPL_BUILD */
/*
* We are done. Do not return, instead branch to second part of board
OpenPOWER on IntegriCloud