build: consolidate CONFIG_HAS_VGA and CONFIG_VGA

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>

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

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
 

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

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