diff options
Diffstat (limited to 'arch/arm/kernel/head.S')
-rw-r--r-- | arch/arm/kernel/head.S | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 8d8748407cbe..d7d69fd7039f 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #include <asm/assembler.h> | 18 | #include <asm/assembler.h> |
19 | #include <asm/domain.h> | 19 | #include <asm/domain.h> |
20 | #include <asm/mach-types.h> | ||
21 | #include <asm/procinfo.h> | 20 | #include <asm/procinfo.h> |
22 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
23 | #include <asm/asm-offsets.h> | 22 | #include <asm/asm-offsets.h> |
@@ -83,7 +82,7 @@ ENTRY(stext) | |||
83 | @ and irqs disabled | 82 | @ and irqs disabled |
84 | bl __lookup_processor_type @ r5=procinfo r9=cpuid | 83 | bl __lookup_processor_type @ r5=procinfo r9=cpuid |
85 | movs r10, r5 @ invalid processor (r5=0)? | 84 | movs r10, r5 @ invalid processor (r5=0)? |
86 | beq __error_p @ yes, error 'p' | 85 | beq __error_p @ yes, error 'p' |
87 | bl __lookup_machine_type @ r5=machinfo | 86 | bl __lookup_machine_type @ r5=machinfo |
88 | movs r8, r5 @ invalid machine (r5=0)? | 87 | movs r8, r5 @ invalid machine (r5=0)? |
89 | beq __error_a @ yes, error 'a' | 88 | beq __error_a @ yes, error 'a' |
@@ -343,16 +342,12 @@ __create_page_tables: | |||
343 | bne 1b | 342 | bne 1b |
344 | #if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS) | 343 | #if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS) |
345 | /* | 344 | /* |
346 | * If we're using the NetWinder, we need to map in | 345 | * If we're using the NetWinder or CATS, we also need to map |
347 | * the 16550-type serial port for the debug messages | 346 | * in the 16550-type serial port for the debug messages |
348 | */ | 347 | */ |
349 | teq r1, #MACH_TYPE_NETWINDER | ||
350 | teqne r1, #MACH_TYPE_CATS | ||
351 | bne 1f | ||
352 | add r0, r4, #0xff000000 >> 18 | 348 | add r0, r4, #0xff000000 >> 18 |
353 | orr r3, r7, #0x7c000000 | 349 | orr r3, r7, #0x7c000000 |
354 | str r3, [r0] | 350 | str r3, [r0] |
355 | 1: | ||
356 | #endif | 351 | #endif |
357 | #ifdef CONFIG_ARCH_RPC | 352 | #ifdef CONFIG_ARCH_RPC |
358 | /* | 353 | /* |