diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-03-18 17:40:33 -0500 |
|---|---|---|
| committer | Alan Tull <r80115@freescale.com> | 2010-08-25 11:52:23 -0500 |
| commit | b6e92df04264c46a4c6692bbd7ff5a27403a7fd6 (patch) | |
| tree | 394dacd069e96f73d26e91ac42c8616b7edb0305 | |
| parent | a1ccb4e8597640812ae3cf5eb5f9bff819ef72c3 (diff) | |
ENGR00121762-2: arm: always get phys_offset from stack pointer for MX5
Allow r3 to be unset on MX5x platforms for runtime physoffset
Signed-off-by: Rob Herring <r.herring@freescale.com>
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index ba67215d2336..437943d6b55e 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -266,7 +266,11 @@ not_relocated: mov r0, #0 * - sp < physoffset + 128MiB (which is definitely true if you * only have 128MiB of RAM or less) */ +#ifdef CONFIG_ARCH_MX5 + and r9, sp, #0xf8000000 +#else andne r9, sp, #0xf8000000 +#endif #ifdef DEBUG kputc #'P' kphex r9, 8 |