diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-03-18 17:40:33 -0500 |
|---|---|---|
| committer | Rob Herring <r.herring@freescale.com> | 2010-03-19 09:39:53 -0500 |
| commit | d213f50bb1ab065a62900c3b77c355606cea7515 (patch) | |
| tree | aec85ee7332a32690b2a5b03585555cb2e781077 | |
| parent | 1f2095e09188d31c36957889cef9683ca534db4d (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 4a7649025228..bd8847683786 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -254,7 +254,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 |