build: convert HAS_VGA use to Kconfig

Use the Kconfig generated CONFIG_HAS_VGA defines in the code base.

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

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index ee8df87a20e19280b69a24b3a221ae25f1c874b1..a42c149c5fdae2c317a4ea74fcab87ffb80b7d96 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -8,7 +8,7 @@ config X86
        select HAS_NS16550
        select HAS_PASSTHROUGH
        select HAS_PCI
-       select HAS_VIDEO
+       select HAS_VGA
 
 config ARCH_DEFCONFIG
        string

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 2ba10ceeb02fb9f4a18b69aa71ff4ebd568b3e18..592d1f2f25a237f7c1ce997c49e23d15a82db9c1 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -2,7 +2,6 @@
 # x86-specific definitions
 
 HAS_NUMA := y
-HAS_VGA  := y
 HAS_CPUFREQ := y
 HAS_EHCI := y
 HAS_KEXEC := y

diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig
index 7fc7aeabea3972565d42ad82c4374b431a683491..2b553d986991fcbbd3139b713786aa4d62c7cec4 100644 (file)
--- a/xen/drivers/video/Kconfig
+++ b/xen/drivers/video/Kconfig
@@ -2,3 +2,8 @@
 # Select HAS_VIDEO if video is supported
 config HAS_VIDEO
        bool
+
+# Select HAS_VGA if VGA is supported
+config HAS_VGA
+       bool
+       select HAS_VIDEO

diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index 914b6cfb7c063687d55c05f0e9c3619fc81bb151..0143c4a6fd3705916bc5f1ab9c1a810a073583a9 100644 (file)
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -1,7 +1,7 @@
-obj-$(HAS_VGA) := vga.o
+obj-$(CONFIG_HAS_VGA) := vga.o
 obj-$(CONFIG_HAS_VIDEO) += font_8x14.o
 obj-$(CONFIG_HAS_VIDEO) += font_8x16.o
 obj-$(CONFIG_HAS_VIDEO) += font_8x8.o
 obj-$(CONFIG_HAS_VIDEO) += lfb.o
-obj-$(HAS_VGA) += vesa.o
+obj-$(CONFIG_HAS_VGA) += vesa.o
 obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o