kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] ARM: Make the magic values in head.S more obvious

Browse source 
Make the magic address values in head.S more obvious as to where
they came from.  Wrap all debug code in CONFIG_DEBUG_LL.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2005-07-01 11:56:55 +01:00 committed by Russell King
parent e695f60454
commit c77b042700
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/arm/kernel/head.S
View file

@ -344,9 +344,9 @@ __create_page_tables:
str r6, [r0] str r6, [r0]
#endif #endif
#ifdef CONFIG_DEBUG_LL
bic r7, r7, #0x0c @ turn off cacheable bic r7, r7, #0x0c @ turn off cacheable
@ and bufferable bits @ and bufferable bits
#ifdef CONFIG_DEBUG_LL
/* /*
* Map in IO space for serial debugging. * Map in IO space for serial debugging.
* This allows debug messages to be output * This allows debug messages to be output
@ -372,27 +372,23 @@ __create_page_tables:
teq r1, #MACH_TYPE_NETWINDER teq r1, #MACH_TYPE_NETWINDER
teqne r1, #MACH_TYPE_CATS teqne r1, #MACH_TYPE_CATS
bne 1f bne 1f
add r0, r4, #0x3fc0 @ ff000000 add r0, r4, #0xff000000 >> 18
mov r3, #0x7c000000 orr r3, r7, #0x7c000000
orr r3, r3, r7 str r3, [r0]
str r3, [r0], #4
add r3, r3, #1 << 20
str r3, [r0], #4
1: 1:
#endif #endif
#endif
#ifdef CONFIG_ARCH_RPC #ifdef CONFIG_ARCH_RPC
/* /*
* Map in screen at 0x02000000 & SCREEN2_BASE * Map in screen at 0x02000000 & SCREEN2_BASE
* Similar reasons here - for debug. This is * Similar reasons here - for debug. This is
* only for Acorn RiscPC architectures. * only for Acorn RiscPC architectures.
*/ */
add r0, r4, #0x80 @ 02000000 add r0, r4, #0x02000000 >> 18
mov r3, #0x02000000 orr r3, r7, #0x02000000
orr r3, r3, r7
str r3, [r0] str r3, [r0]
add r0, r4, #0x3600 @ d8000000 add r0, r4, #0xd8000000 >> 18
str r3, [r0] str r3, [r0]
#endif
#endif #endif
mov pc, lr mov pc, lr
.ltorg .ltorg