diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-28 17:20:39 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-28 17:20:39 -0400 |
| commit | 250d375d1da45a5e08ab8baf5eaa7eb258afd82b (patch) | |
| tree | fb5dc6df00065f11578f837835c6d5a99530b223 /arch/arm/boot/compressed/head.S | |
| parent | 84904d0ead0a8c419abd45c7b2ac8d76d50a0d48 (diff) | |
| parent | 6afd6fae1d5f7e7129a10c4f3e32018966eeac1c (diff) | |
Merge nommu branch
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 75df1f764a10..e5ab51b9cceb 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -82,9 +82,11 @@ | |||
| 82 | kphex r6, 8 /* processor id */ | 82 | kphex r6, 8 /* processor id */ |
| 83 | kputc #':' | 83 | kputc #':' |
| 84 | kphex r7, 8 /* architecture id */ | 84 | kphex r7, 8 /* architecture id */ |
| 85 | #ifdef CONFIG_CPU_CP15 | ||
| 85 | kputc #':' | 86 | kputc #':' |
| 86 | mrc p15, 0, r0, c1, c0 | 87 | mrc p15, 0, r0, c1, c0 |
| 87 | kphex r0, 8 /* control reg */ | 88 | kphex r0, 8 /* control reg */ |
| 89 | #endif | ||
| 88 | kputc #'\n' | 90 | kputc #'\n' |
| 89 | kphex r5, 8 /* decompressed kernel start */ | 91 | kphex r5, 8 /* decompressed kernel start */ |
| 90 | kputc #'-' | 92 | kputc #'-' |
| @@ -507,7 +509,11 @@ call_kernel: bl cache_clean_flush | |||
| 507 | */ | 509 | */ |
| 508 | 510 | ||
| 509 | call_cache_fn: adr r12, proc_types | 511 | call_cache_fn: adr r12, proc_types |
| 512 | #ifdef CONFIG_CPU_CP15 | ||
| 510 | mrc p15, 0, r6, c0, c0 @ get processor ID | 513 | mrc p15, 0, r6, c0, c0 @ get processor ID |
| 514 | #else | ||
| 515 | ldr r6, =CONFIG_PROCESSOR_ID | ||
| 516 | #endif | ||
| 511 | 1: ldr r1, [r12, #0] @ get value | 517 | 1: ldr r1, [r12, #0] @ get value |
| 512 | ldr r2, [r12, #4] @ get mask | 518 | ldr r2, [r12, #4] @ get mask |
| 513 | eor r1, r1, r6 @ (real ^ match) | 519 | eor r1, r1, r6 @ (real ^ match) |