build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO

No real advantage to keeping these separate. The use case of this from
Linux is when the platform or target board has support for something but
the user wants to be given the option to disable it.

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

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 60e923cd460d40ed7c4440be5bdb37b2eb1c75a3..cb99df56556dd78ab130dd4dfa101bb7b0a2b275 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -22,7 +22,7 @@ config ARM
        select HAS_MEM_ACCESS
        select HAS_PASSTHROUGH
        select HAS_PDX
-       select HAS_VIDEO
+       select VIDEO
 
 config ARCH_DEFCONFIG
        string

diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile
index 6270e831ca0208e481bd178ead11b8b16da47950..19391802a8398e1f135a70c539029df3c5d5e79c 100644 (file)
--- a/xen/drivers/Makefile
+++ b/xen/drivers/Makefile
@@ -3,4 +3,4 @@ subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq
 subdir-$(CONFIG_HAS_PCI) += pci
 subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough
 subdir-$(CONFIG_ACPI) += acpi
-subdir-$(CONFIG_HAS_VIDEO) += video
+subdir-$(CONFIG_VIDEO) += video

diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig
index 03e1e18ae8fecf09a94eafb9c42c7fcd0ffde2d8..739fe6fa945da2f18123d49d239c9ac9ff1198c7 100644 (file)
--- a/xen/drivers/video/Kconfig
+++ b/xen/drivers/video/Kconfig
@@ -1,12 +1,12 @@
 
-# Select HAS_VIDEO if video is supported
-config HAS_VIDEO
+# Select VIDEO if video is supported
+config VIDEO
        bool
 
 # Select VGA if VGA is supported
 config VGA
        bool
-       select HAS_VIDEO
+       select VIDEO
 
 # Select HAS_ARM_HDLCD if ARM HDLCD is supported
 config HAS_ARM_HDLCD

diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index fab7aba70d572776f8b3dbacec35261f92855a49..2bb91d62a548dbb6c7d4cccda3f2c63de2dce2c2 100644 (file)
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_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-$(CONFIG_VIDEO) += font_8x14.o
+obj-$(CONFIG_VIDEO) += font_8x16.o
+obj-$(CONFIG_VIDEO) += font_8x8.o
+obj-$(CONFIG_VIDEO) += lfb.o
 obj-$(CONFIG_VGA) += vesa.o
 obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o

diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index c0ad469e02afb242573c09d1afd69a0ad716edf5..b5d155ebb12df9e1a4215d498586652df880d440 100644 (file)
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -33,8 +33,6 @@
 
 #define CONFIG_SMP 1
 
-#define CONFIG_VIDEO 1
-
 #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1
 
 #define CONFIG_PAGEALLOC_MAX_ORDER 18

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 004a7f6a2f0cba0ddc235e2eba0a153f05769476..4527ce371de0f507fba8de6d67d290066124fe65 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -42,8 +42,6 @@
 #define CONFIG_ACPI_SRAT 1
 #define CONFIG_ACPI_CSTATE 1
 
-#define CONFIG_VIDEO 1
-
 #define CONFIG_WATCHDOG 1
 
 #define CONFIG_MULTIBOOT 1