ARM: shmobile: Hack x86_64 to enable OF by default
PATCH 1/3 ARM: shmobile: Hack x86_64 to enable OF by default
From: Magnus Damm <[email protected]>
Select OF on x86_64 by default to allow building the OF portion of the R-Car DU driver on a 64-bit architecture.
Not for upstream merge.
Not-yet-Signed-off-by Magnus Damm <[email protected]>
---
arch/x86/Kconfig | 1 + arch/x86/kernel/devicetree.c | 2 ++ 2 files changed, 3 insertions(+)
arch/x86/Kconfig +1 -0
@@ -138,6 +138,7 @@ config X86 select HAVE_ACPI_APEI_NMI if ACPI select ACPI_LEGACY_TABLES_LOOKUP if ACPI select X86_FEATURE_NAMES if PROC_FS + select OF config INSTRUCTION_DECODER def_bool y
arch/x86/kernel/devicetree.c +2 -0
@@ -150,11 +150,13 @@ static void __init dtb_lapic_setup(void)if (WARN_ON (ret))return ; +#ifdef CONFIG_X86_32 /* Did the boot loader setup the local APIC ? */ if (!cpu_has_apic) {if (apic_force_enable (r.start))return ; } +#endif smp_found_config =1 ; pic_mode =1 ;register_lapic_address (r.start);