[Xen-devel] [PATCH 1/2] build: consolidate CONFIG_HAS_VGA and CONFIG_VGA

[Doug Goldstein <cardoe@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
CC: Keir Fraser <keir@xxxxxxx>
CC: Jan Beulich <jbeulich@xxxxxxxx>
CC: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/Kconfig         | 2 +-
 xen/drivers/video/Kconfig    | 4 ++--
 xen/drivers/video/Makefile   | 4 ++--
 xen/include/asm-x86/config.h | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index ca233b7..73f79cc 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -19,8 +19,8 @@ config X86
        select HAS_PASSTHROUGH
        select HAS_PCI
        select HAS_PDX
-       select HAS_VGA
        select NUMA
+       select VGA
 
 config ARCH_DEFCONFIG
        string
diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig
index 8b25694..03e1e18 100644
--- a/xen/drivers/video/Kconfig
+++ b/xen/drivers/video/Kconfig
@@ -3,8 +3,8 @@
 config HAS_VIDEO
        bool
 
-# Select HAS_VGA if VGA is supported
-config HAS_VGA
+# Select VGA if VGA is supported
+config VGA
        bool
        select HAS_VIDEO
 
diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index b9b5e23..fab7aba 100644
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -1,7 +1,7 @@
-obj-$(CONFIG_HAS_VGA) := vga.o
+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_HAS_VGA) += vesa.o
+obj-$(CONFIG_VGA) += vesa.o
 obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 08addfb..004a7f6 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -42,7 +42,6 @@
 #define CONFIG_ACPI_SRAT 1
 #define CONFIG_ACPI_CSTATE 1
 
-#define CONFIG_VGA 1
 #define CONFIG_VIDEO 1
 
 #define CONFIG_WATCHDOG 1
-- 
2.4.10


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel