mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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>
This commit is contained in:
Doug Goldstein authored and Jan Beulich committed
1 parent
ff2f342d0a
commit
b07408ec75
6 files changed
+9
-13
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||