[Xen-devel] [PATCH v7 11/28] build: convert HAS_VIDEO use to Kconfig

[Doug Goldstein <cardoe@xxxxxxxxxx>]

Use the Kconfig generated CONFIG_HAS_VIDEO defines in the code base.

CC: Ian Campbell <ian.campbell@xxxxxxxxxx>
CC: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
CC: Keir Fraser <keir@xxxxxxx>
CC: Jan Beulich <jbeulich@xxxxxxxx>
CC: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
---
 xen/arch/arm/Kconfig       | 1 +
 xen/arch/arm/Rules.mk      | 1 -
 xen/arch/x86/Kconfig       | 1 +
 xen/arch/x86/Rules.mk      | 1 -
 xen/drivers/Kconfig        | 2 ++
 xen/drivers/Makefile       | 2 +-
 xen/drivers/video/Kconfig  | 4 ++++
 xen/drivers/video/Makefile | 8 ++++----
 8 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 xen/drivers/video/Kconfig

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 93e64f6..c88a5d8 100644
--- 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 4725374..90b1f24 100644
--- 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 5e6c6c9..ee8df87 100644
--- 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 166deb9..8fda89e 100644
--- 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 eb01d47..f0ad01e 100644
--- 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 9f6c18b..01d6b8d 100644
--- 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
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 a756292..914b6cf 100644
--- 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
-- 
2.4.10


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