kconfig: introduce option to independently enable libfdt

Currently, the inclusion of libfdt is controlled by the CONFIG_HAS_DEVICE_TREE
kconfig flag. This flag also changes behavior in a few places, such as boot
module processing for XSM. To support the ability to include libfdt without
changing these behaviors, introduce CONFIG_LIBFDT. The inclusion of
libfdt is then moved under CONFIG_LIBFDT.

Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
Reviewed-by: Denis Mukhin <dmukhin@ford.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 42a2b6a03f6a3b73af585369850e39ba8f135beb..be28060716123380b24f6460bd2e0673d2ad0f6e 100644 (file)
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -72,6 +72,7 @@ config HAS_COMPAT
 
 config HAS_DEVICE_TREE
        bool
+       select LIBFDT
 
 config HAS_DIT # Data Independent Timing
        bool
@@ -109,6 +110,9 @@ config HAS_UBSAN
 config HAS_VMAP
        bool
 
+config LIBFDT
+       bool
+
 config MEM_ACCESS_ALWAYS_ON
        bool
 

diff --git a/xen/common/Makefile b/xen/common/Makefile
index f625031d16f0d437465f106ced9ea825edf33bf3..98f08730563fac3c92134e39dbb5e7ba2ff41988 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -80,7 +80,7 @@ obj-y += sched/
 obj-$(CONFIG_UBSAN) += ubsan/
 
 obj-$(CONFIG_NEEDS_LIBELF) += libelf/
-obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
+obj-$(CONFIG_LIBFDT) += libfdt/
 
 CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(objtree)/)$(KCONFIG_CONFIG)
 $(obj)/config.gz: $(CONF_FILE)