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:27:34 +0100
commita7b13c78bc4316bae28751c6039819008fc92a59 (patch)
tree813c8b6c83e3eeac2c4e8e00d90e326307733089
parentade5b109ac88d0903f25e5ac175cbf1d7eafbdfe (diff)
downloadbarebox-stable/v2015.02.tar.gz
ARM Samsung: fix booting from NAND without pblstable/v2015.02
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>
-rw-r--r--arch/arm/mach-samsung/lowlevel-s3c24x0.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-samsung/lowlevel-s3c24x0.S b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
index 626ad04..d43cdff 100644
--- a/arch/arm/mach-samsung/lowlevel-s3c24x0.S
+++ b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
@@ -15,7 +15,6 @@
*/
#include <config.h>
-#include <linux/sizes.h>
#include <mach/s3c-iomap.h>
.section ".text_bare_init.s3c24x0_disable_wd","ax"
@@ -251,7 +250,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 +261,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