diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-01 06:56:55 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-01 06:56:55 -0400 |
commit | c77b042700ae1fc4d661d7d62787899e755160d5 (patch) | |
tree | faa9b2abe3b3c73150fc7b9feaa552ba04220b90 /arch/arm/kernel/head.S | |
parent | e695f60454f665604fe1b6e473f25b098203965a (diff) |
[PATCH] ARM: Make the magic values in head.S more obvious
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>
Diffstat (limited to 'arch/arm/kernel/head.S')
-rw-r--r-- | arch/arm/kernel/head.S | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index bd4823c7464..1155cf07c87 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -344,9 +344,9 @@ __create_page_tables: | |||
344 | str r6, [r0] | 344 | str r6, [r0] |
345 | #endif | 345 | #endif |
346 | 346 | ||
347 | #ifdef CONFIG_DEBUG_LL | ||
347 | bic r7, r7, #0x0c @ turn off cacheable | 348 | bic r7, r7, #0x0c @ turn off cacheable |
348 | @ and bufferable bits | 349 | @ and bufferable bits |
349 | #ifdef CONFIG_DEBUG_LL | ||
350 | /* | 350 | /* |
351 | * Map in IO space for serial debugging. | 351 | * Map in IO space for serial debugging. |
352 | * This allows debug messages to be output | 352 | * This allows debug messages to be output |
@@ -372,28 +372,24 @@ __create_page_tables: | |||
372 | teq r1, #MACH_TYPE_NETWINDER | 372 | teq r1, #MACH_TYPE_NETWINDER |
373 | teqne r1, #MACH_TYPE_CATS | 373 | teqne r1, #MACH_TYPE_CATS |
374 | bne 1f | 374 | bne 1f |
375 | add r0, r4, #0x3fc0 @ ff000000 | 375 | add r0, r4, #0xff000000 >> 18 |
376 | mov r3, #0x7c000000 | 376 | orr r3, r7, #0x7c000000 |
377 | orr r3, r3, r7 | 377 | str r3, [r0] |
378 | str r3, [r0], #4 | ||
379 | add r3, r3, #1 << 20 | ||
380 | str r3, [r0], #4 | ||
381 | 1: | 378 | 1: |
382 | #endif | 379 | #endif |
383 | #endif | ||
384 | #ifdef CONFIG_ARCH_RPC | 380 | #ifdef CONFIG_ARCH_RPC |
385 | /* | 381 | /* |
386 | * Map in screen at 0x02000000 & SCREEN2_BASE | 382 | * Map in screen at 0x02000000 & SCREEN2_BASE |
387 | * Similar reasons here - for debug. This is | 383 | * Similar reasons here - for debug. This is |
388 | * only for Acorn RiscPC architectures. | 384 | * only for Acorn RiscPC architectures. |
389 | */ | 385 | */ |
390 | add r0, r4, #0x80 @ 02000000 | 386 | add r0, r4, #0x02000000 >> 18 |
391 | mov r3, #0x02000000 | 387 | orr r3, r7, #0x02000000 |
392 | orr r3, r3, r7 | ||
393 | str r3, [r0] | 388 | str r3, [r0] |
394 | add r0, r4, #0x3600 @ d8000000 | 389 | add r0, r4, #0xd8000000 >> 18 |
395 | str r3, [r0] | 390 | str r3, [r0] |
396 | #endif | 391 | #endif |
392 | #endif | ||
397 | mov pc, lr | 393 | mov pc, lr |
398 | .ltorg | 394 | .ltorg |
399 | 395 | ||