[PATCH 07/20] ARM64 / ACPI: Enable ARM64 in Kconfig
From: catalin.marinas@arm.com (Catalin Marinas)
Date: 2014-01-23 16:39:51
Also in:
linux-acpi, lkml
On Fri, Jan 17, 2014 at 12:25:01PM +0000, Hanjun Guo wrote:
quoted hunk ↗ jump to hunk
Add Kconfigs to build ACPI on ARM64, and make ACPI runable on ARM64. acpi_idle driver is x86/IA64 dependent now, so make CONFIG_ACPI_PROCESSOR depends on X86 || IA64, and implement it on ARM/ARM64 in the furture. In order to make arm-core.c can both run on ARM and ARM64, introduce CONFIG_ACPI_ARM to support it. Signed-off-by: Graeme Gregory <redacted> Signed-off-by: Al Stone <redacted> Signed-off-by: Hanjun Guo <redacted> --- arch/arm64/Kconfig | 2 ++ drivers/acpi/Kconfig | 11 ++++++++--- drivers/acpi/plat/Makefile | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-)diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 6d4dd22..2b1fb1d 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig@@ -279,6 +279,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "drivers/acpi/Kconfig" + source "fs/Kconfig" source "arch/arm64/kvm/Kconfig"diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4770de5..cae5dc9 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig@@ -2,13 +2,16 @@ # ACPI Configuration # +config ACPI_ARM + bool
Could be better as def_bool ARM64
+ menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on !IA64_HP_SIM - depends on IA64 || X86 - depends on PCI + depends on ((IA64 || X86) && PCI) || ARM64 select PNP - default y + select ACPI_ARM if ARM64
And remove this select here. -- Catalin