[Xen-devel] [RFC 16/29] build: convert HAS_KEXEC use to Kconfig

[Doug Goldstein <cardoe@xxxxxxxxxx>]

Use the Kconfig generated CONFIG_HAS_KEXEC defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
---
 xen/Rules.mk          | 2 +-
 xen/arch/x86/Kconfig  | 1 +
 xen/arch/x86/Rules.mk | 1 -
 xen/common/Kconfig    | 4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index bb9d0c1..82a4d0a 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -68,7 +68,7 @@ ifneq ($(max_phys_irqs),)
 CFLAGS-y                += -DMAX_PHYS_IRQS=$(max_phys_irqs)
 endif
 
-CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec)
+CONFIG_KEXEC-$(CONFIG_HAS_KEXEC) := $(kexec)
 CONFIG_KEXEC              := $(CONFIG_KEXEC-y)
 
 CFLAGS-$(CONFIG_KEXEC)  += -DCONFIG_KEXEC
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 8ff2e19..48c7d6a 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -26,6 +26,7 @@ config X86
        select HAS_NS16550
        select HAS_GDBSX
        select HAS_PDX
+       select HAS_KEXEC
 
 config ARCH_DEFCONFIG
        string
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index a300937..b248043 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -2,7 +2,6 @@
 # x86-specific definitions
 
 HAS_EHCI := y
-HAS_KEXEC := y
 xenoprof := y
 
 CFLAGS += -I$(BASEDIR)/include 
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index b429a64..6987e84 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -9,6 +9,10 @@ config HAS_DEVICE_TREE
 config HAS_PDX
        bool
 
+# Select HAS_KEXEC if kexec is supported
+config HAS_KEXEC
+       bool
+
 # Select HAS_GDBSX if GDBSX is supported
 config HAS_GDBSX
        bool
-- 
2.4.9


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel