summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-02-24 15:53:48 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-02-25 08:28:45 +0100
commitd021461b881cff98088a44df224953ed303c5c47 (patch)
treee41a876939fb8f5c827f78193dde32369b8622a9
parentaa360336a9e14440df7879be3a79a7e470690774 (diff)
downloadbarebox-stable/v2014.09.tar.gz
ARM Samsung: fix booting from NAND without pblstable/v2014.09
This was broken in 558d72dc5116 (ARM Samsung: fix booting from NAND with pbl). '_text' is TEXT_BASE when building without pbl and (TEXT_BASE - SZ_2M) when building with pbl, so this works in both cases. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Conflicts: arch/arm/mach-samsung/lowlevel-s3c24x0.S
-rw-r--r--arch/arm/mach-samsung/lowlevel-s3c24x0.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-samsung/lowlevel-s3c24x0.S b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
index 52079ff..09b6d7b 100644
--- a/arch/arm/mach-samsung/lowlevel-s3c24x0.S
+++ b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
@@ -251,7 +251,7 @@ s3c24x0_nand_boot:
beq 2f
mov pc, lr /* NOR case: nothing to do here */
-2: ldr sp, =(TEXT_BASE - SZ_2M) /* Setup a temporary stack in SDRAM */
+2: ldr sp, =_text /* Setup a temporary stack in SDRAM */
/*
* We still run at a location we are not linked to. But lets still running
* from the internal SRAM, this may speed up the boot
@@ -262,7 +262,7 @@ s3c24x0_nand_boot:
/*
* Adjust the return address to the correct address in SDRAM
*/
- ldr r1, =(TEXT_BASE - SZ_2M)
+ ldr r1, =_text
add lr, lr, r1
mov pc, lr