build: convert HAS_ARM_HDLCD use to Kconfig

Use the Kconfig generated CONFIG_HAS_ARM_HDLCD defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 1ac2233125756a7f86434a7612aa46bc3ed65617..ec2406c6ba758db78fad14925c042670a4ad2ba9 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -16,6 +16,7 @@ config ARM_64
 
 config ARM
        def_bool y
+       select HAS_ARM_HDLCD
        select HAS_DEVICE_TREE
        select HAS_PASSTHROUGH
        select HAS_PDX

diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk
index 52b1ad481d5940cf8e5b8f6ecd58aae4fafb622a..2158bd84a0bdb7b3fbae5960df16886bc583ff56 100644 (file)
--- a/xen/arch/arm/Rules.mk
+++ b/xen/arch/arm/Rules.mk
@@ -6,8 +6,6 @@
 # 'make clean' before rebuilding.
 #
 
-HAS_ARM_HDLCD := y
-
 CFLAGS += -I$(BASEDIR)/include
 
 $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))

diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig
index 2b553d986991fcbbd3139b713786aa4d62c7cec4..8b25694b3259e14bd8214205a21aa8c387d2a1cc 100644 (file)
--- a/xen/drivers/video/Kconfig
+++ b/xen/drivers/video/Kconfig
@@ -7,3 +7,7 @@ config HAS_VIDEO
 config HAS_VGA
        bool
        select HAS_VIDEO
+
+# Select HAS_ARM_HDLCD if ARM HDLCD is supported
+config HAS_ARM_HDLCD
+       bool

diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index 0143c4a6fd3705916bc5f1ab9c1a810a073583a9..b9b5e2347e914b0e5e4f71a56af87df3be4772a9 100644 (file)
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -4,4 +4,4 @@ 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-$(HAS_ARM_HDLCD) += arm_hdlcd.o
+obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o