Use the Kconfig generated CONFIG_HAS_VGA defines in the code base.
CC: Keir Fraser <k...@xen.org>
CC: Jan Beulich <jbeul...@suse.com>
CC: Andrew Cooper <andrew.coop...@citrix.com>
Signed-off-by: Doug Goldstein <car...@cardoe.com>
---
xen/arch/x86/Kconfig | 1 +
xen/arch/x86/Rules.mk | 1 -
xen/drivers/video/Kconfig | 4 ++++
xen/drivers/video/Makefile | 4 ++--
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index ee8df87..b03d228 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -8,6 +8,7 @@ config X86
select HAS_NS16550
select HAS_PASSTHROUGH
select HAS_PCI
+ select HAS_VGA
select HAS_VIDEO
config ARCH_DEFCONFIG
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 8fda89e..47d4dc6 100644
--- 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 7fc7aea..6a7cafc 100644
--- a/xen/drivers/video/Kconfig
+++ b/xen/drivers/video/Kconfig
@@ -2,3 +2,7 @@
# Select HAS_VIDEO if video is supported
config HAS_VIDEO
bool
+
+# Select HAS_VGA if VGA is supported
+config HAS_VGA
+ bool
diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index 914b6cf..0143c4a 100644
--- 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
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
