提交 4d901c42 编写于 作者: R Rob Herring 提交者: Russell King

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: NTony Lindgren <tony@atomide.com>
Acked-by: NNicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: NRob Herring <rob.herring@calxeda.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 cada3c08
...@@ -206,11 +206,17 @@ __create_page_tables: ...@@ -206,11 +206,17 @@ __create_page_tables:
#endif #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 mov r0, r2, lsr #20
orr r6, r7, r8 movs r0, r0, lsl #20
str r6, [r0] 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 #ifdef CONFIG_DEBUG_LL
#ifndef CONFIG_DEBUG_ICEDCC #ifndef CONFIG_DEBUG_ICEDCC
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册