diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-02-02 16:33:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-17 23:27:33 +0000 |
| commit | 4d901c4271951d110afb13ee9aa73d27a6c8e53d (patch) | |
| tree | 3ac2bd52f6029f382399cf15cf35abe568401818 | |
| parent | cada3c0841e1deaec4c0f92654610b028dc683ff (diff) | |
| download | linux-stable-4d901c4271951d110afb13ee9aa73d27a6c8e53d.tar.gz linux-stable-4d901c4271951d110afb13ee9aa73d27a6c8e53d.tar.bz2 linux-stable-4d901c4271951d110afb13ee9aa73d27a6c8e53d.zip | |
ARM: 6648/1: map ATAGs when not in first 1MB of RAM
If ATAGs or DTB pointer is not within first 1MB of RAM, then the boot params
will not be mapped early enough, so map the 1MB region that r2 points to. Only
map the first 1MB when r2 is 0.
Some assembly improvements from Nicolas Pitre.
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/kernel/head.S | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index a94dd99d54c3..591a2ead8cef 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -206,11 +206,17 @@ __create_page_tables: #endif /* - * Then map first 1MB of ram in case it contains our boot params. + * Then map boot params address in r2 or + * the first 1MB of ram if boot params address is not specified. */ - add r0, r4, #PAGE_OFFSET >> 18 - orr r6, r7, r8 - str r6, [r0] + mov r0, r2, lsr #20 + movs r0, r0, lsl #20 + moveq r0, r8 + sub r3, r0, r8 + add r3, r3, #PAGE_OFFSET + add r3, r4, r3, lsr #18 + orr r6, r7, r0 + str r6, [r3] #ifdef CONFIG_DEBUG_LL #ifndef CONFIG_DEBUG_ICEDCC |