build: convert HAS_VIDEO use to Kconfig

Use the Kconfig generated CONFIG_HAS_VIDEO defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 93e64f66970d0a280ff11a58414dbdfcb9ca0623..c88a5d8855f3e88e0921edf6b0e9e59166cd2e82 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -18,6 +18,7 @@ config ARM
        def_bool y
        select HAS_DEVICE_TREE
        select HAS_PASSTHROUGH
+       select HAS_VIDEO
 
 config ARCH_DEFCONFIG
        string

diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk
index 4725374aa6a43a5220078b52b60365cf290ec800..90b1f246fe301defa70ed2923d58568e1f1fc2c7 100644 (file)
--- a/xen/arch/arm/Rules.mk
+++ b/xen/arch/arm/Rules.mk
@@ -6,7 +6,6 @@
 # 'make clean' before rebuilding.
 #
 
-HAS_VIDEO := y
 HAS_ARM_HDLCD := y
 HAS_PDX := y
 

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 5e6c6c901aa1cb865a516b01ffac6528ac7f96e9..ee8df87a20e19280b69a24b3a221ae25f1c874b1 100644 (file)
--- 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_VIDEO
 
 config ARCH_DEFCONFIG
        string

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 66d50f4930894f5a483efdcbb444c75ba9da15ce..2ba10ceeb02fb9f4a18b69aa71ff4ebd568b3e18 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -3,7 +3,6 @@
 
 HAS_NUMA := y
 HAS_VGA  := y
-HAS_VIDEO  := y
 HAS_CPUFREQ := y
 HAS_EHCI := y
 HAS_KEXEC := y

diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig
index eb01d472d5d937afdf69566cfbb836c735d66c5f..f0ad01e26bb4647ae869bedbaddb14d9549a848e 100644 (file)
--- a/xen/drivers/Kconfig
+++ b/xen/drivers/Kconfig
@@ -8,4 +8,6 @@ source "drivers/passthrough/Kconfig"
 
 source "drivers/pci/Kconfig"
 
+source "drivers/video/Kconfig"
+
 endmenu

diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile
index 9f6c18bcc3d1d4f47af8fbb26f2da261b2d6854a..01d6b8d3260fc09efcd3f987079bc1de27f73986 100644 (file)
--- a/xen/drivers/Makefile
+++ b/xen/drivers/Makefile
@@ -3,4 +3,4 @@ subdir-$(HAS_CPUFREQ) += cpufreq
 subdir-$(CONFIG_HAS_PCI) += pci
 subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough
 subdir-$(CONFIG_HAS_ACPI) += acpi
-subdir-$(HAS_VIDEO) += video
+subdir-$(CONFIG_HAS_VIDEO) += video

diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig
new file mode 100644 (file)
index 0000000..7fc7aea
--- /dev/null
+++ b/xen/drivers/video/Kconfig
@@ -0,0 +1,4 @@
+
+# Select HAS_VIDEO if video is supported
+config HAS_VIDEO
+       bool

diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index a75629273ea908226d8d6b1719e2c539a78d2353..914b6cfb7c063687d55c05f0e9c3619fc81bb151 100644 (file)
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -1,7 +1,7 @@
 obj-$(HAS_VGA) := vga.o
-obj-$(HAS_VIDEO) += font_8x14.o
-obj-$(HAS_VIDEO) += font_8x16.o
-obj-$(HAS_VIDEO) += font_8x8.o
-obj-$(HAS_VIDEO) += lfb.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-$(HAS_ARM_HDLCD) += arm_hdlcd.o