build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI

No real advantage to keeping these separate. The use case of this from
Linux is when the platform or target board has support for something but
the user wants to be given the option to disable it.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 3a90f47f6b7d005259345c02024b3dde4a771dc4..63f4b191c173ea26a018c632dad18c6dcb06b618 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -3,9 +3,9 @@ config X86_64
 
 config X86
        def_bool y
+       select ACPI
        select ACPI_LEGACY_TABLES_LOOKUP
        select COMPAT
-       select HAS_ACPI
        select HAS_CPUFREQ
        select HAS_EHCI
        select HAS_GDBSX

diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index 16240245ae219525bbd17aa3176e68a2a4381cee..58162f591373082533416a1d828b84dc2f821fea 100644 (file)
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -171,7 +171,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
         op->u.availheap.avail_bytes <<= PAGE_SHIFT;
         break;
 
-#if defined (CONFIG_HAS_ACPI) && defined (CONFIG_HAS_CPUFREQ)
+#if defined (CONFIG_ACPI) && defined (CONFIG_HAS_CPUFREQ)
     case XEN_SYSCTL_get_pmstat:
         ret = do_get_pm_info(&op->u.get_pmstat);
         break;

diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile
index 7bbb654fad19df50da8867377faa7522240eabdd..6270e831ca0208e481bd178ead11b8b16da47950 100644 (file)
--- a/xen/drivers/Makefile
+++ b/xen/drivers/Makefile
@@ -2,5 +2,5 @@ subdir-y += char
 subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq
 subdir-$(CONFIG_HAS_PCI) += pci
 subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough
-subdir-$(CONFIG_HAS_ACPI) += acpi
+subdir-$(CONFIG_ACPI) += acpi
 subdir-$(CONFIG_HAS_VIDEO) += video

diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
index 82d73cad76370a69404a482d911923678a76de5e..1edcca7253ef9f2a9f94f3743efce1b9cc72d81e 100644 (file)
--- a/xen/drivers/acpi/Kconfig
+++ b/xen/drivers/acpi/Kconfig
@@ -1,6 +1,6 @@
 
-# Select HAS_ACPI if ACPI is supported
-config HAS_ACPI
+# Select ACPI if ACPI is supported
+config ACPI
        bool
 
 config ACPI_LEGACY_TABLES_LOOKUP

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index c9f08c23e9dd4a9e1f7df8f564d1653a27a56723..e90774110bf61a5af2ab452efaee0097c21f71e8 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -37,7 +37,6 @@
 /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */
 #define CONFIG_X86_L1_CACHE_SHIFT 7
 
-#define CONFIG_ACPI 1
 #define CONFIG_ACPI_BOOT 1
 #define CONFIG_ACPI_SLEEP 1
 #define CONFIG_ACPI_NUMA 1