diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-02-24 15:53:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-25 08:28:33 +0100 |
| commit | c92836dc8b5e7f6864030a2a00b098adcf5d8733 (patch) | |
| tree | bfcc709b660f042e60ee27301a9c8bd8995d8a06 | |
| parent | 0714e2791cfffc6d7030b02a7501240e80b06939 (diff) | |
| download | barebox-stable/v2014.10.tar.gz | |
ARM Samsung: fix booting from NAND without pblstable/v2014.10
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.S | 4 |
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 52079ffc7b..09b6d7bfdc 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 |