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:29:09 +0100 |
| commit | aea722ba207823d9414f24384b1782c160c733ac (patch) | |
| tree | 35c1d2cb38cc10bd4f883b094bf8d25d5dbc556e | |
| parent | 88a332cabb2b0894b024292856c5ef6bda22a130 (diff) | |
| download | barebox-stable/v2014.07.tar.gz | |
ARM Samsung: fix booting from NAND without pblstable/v2014.07
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 e2efd86e8c..849fdad31d 100644 --- a/arch/arm/mach-samsung/lowlevel-s3c24x0.S +++ b/arch/arm/mach-samsung/lowlevel-s3c24x0.S @@ -259,7 +259,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 @@ -270,7 +270,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 |