[Xen-changelog] [xen master] build: convert HAS_VGA use to Kconfig

[patchbot@xxxxxxx]

commit 56f7d5db127824d6846d0ae89f869f5c59bc7893
Author:     Doug Goldstein <cardoe@xxxxxxxxxx>
AuthorDate: Tue Dec 15 14:14:00 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Dec 16 17:47:48 2015 +0100

    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@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/Kconfig       |    2 +-
 xen/arch/x86/Rules.mk      |    1 -
 xen/drivers/video/Kconfig  |    5 +++++
 xen/drivers/video/Makefile |    4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index ee8df87..a42c149 100644
--- 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 2ba10ce..592d1f2 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..2b553d9 100644
--- 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 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog