diff options
author | Tian Fang <tfang@fb.com> | 2015-04-24 14:33:32 +0100 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2015-05-06 16:15:30 +0100 |
commit | 37280723862708b2af74c32ddfc5907faec8998f (patch) | |
tree | b025e91c6305c1eb9f1d0536bbf7452ee3bae144 /arch/arm/kernel | |
parent | 98f979f8a4842a4e6bf56e6b63aa334e3997ca18 (diff) | |
download | linux-stable-37280723862708b2af74c32ddfc5907faec8998f.tar.gz |
Add support for openbmc (wedge)
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/head.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 8ff0e2379fd8..21e17dc94cb5 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -21,7 +21,6 @@ #include <asm/memory.h> #include <asm/thread_info.h> #include <asm/system.h> -#include <asm/mach-types.h> #if (PHYS_OFFSET & 0x001fffff) #error "PHYS_OFFSET must be at an even 2MiB boundary!" @@ -77,14 +76,13 @@ */ .section ".text.head", "ax" ENTRY(stext) - ldr r5, =machine_arch_type @ find the machine type msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode @ and irqs disabled mrc p15, 0, r9, c0, c0 @ get processor id bl __lookup_processor_type @ r5=procinfo r9=cpuid movs r10, r5 @ invalid processor (r5=0)? beq __error_p @ yes, error 'p' -@ bl __lookup_machine_type @ r5=machinfo + bl __lookup_machine_type @ r5=machinfo movs r8, r5 @ invalid machine (r5=0)? beq __error_a @ yes, error 'a' bl __vet_atags |