From aa34fbc087f246cbd83223bed499ca62694787d8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 22 Feb 2016 22:55:45 -0700 Subject: fdt: Allow libfdt to be used in SPL Add an option to enable libfdt in SPL. This can be useful when decoding FIT files in SPL. We need to make sure this option is not enabled in SPL by this change. Also this option needs to be enabled in host builds. Si add a new IMAGE_USE_LIBFDT #define which can be used in files that are built on the host but must also build for U-Boot and SPL. Signed-off-by: Simon Glass --- lib/Kconfig | 10 ++++++++++ lib/Makefile | 6 +----- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/Kconfig b/lib/Kconfig index d22a8e4338..078ef5c29e 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -138,6 +138,16 @@ config OF_LIBFDT particular compatible nodes. The library operates on a flattened version of the device tree. +config SPL_OF_LIBFDT + bool "Enable the FDT library for SPL" + default y if SPL_OF_CONTROL + help + This enables the FDT library (libfdt). It provides functions for + accessing binary device tree images in memory, such as adding and + removing notes and properties, scanning through the tree and finding + particular compatible nodes. The library operates on a flattened + version of the device tree. + source lib/efi/Kconfig endmenu diff --git a/lib/Makefile b/lib/Makefile index 1e21bcc4c7..d49ee62a92 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -14,8 +14,6 @@ obj-$(CONFIG_LZO) += lzo/ obj-$(CONFIG_ZLIB) += zlib/ obj-$(CONFIG_BZIP2) += bzip2/ obj-$(CONFIG_TIZEN) += tizen/ -obj-$(CONFIG_OF_LIBFDT) += libfdt/ -obj-$(CONFIG_FIT) += libfdt/ obj-$(CONFIG_FIT) += libfdt/ obj-$(CONFIG_CMD_DHRYSTONE) += dhry/ @@ -50,9 +48,7 @@ obj-$(CONFIG_BITREVERSE) += bitrev.o obj-y += list_sort.o endif -ifndef CONFIG_SPL_BUILD -obj-$(CONFIG_OF_LIBFDT) += libfdt/ -endif +obj-$(CONFIG_$(SPL_)OF_LIBFDT) += libfdt/ ifdef CONFIG_SPL_OF_CONTROL obj-$(CONFIG_OF_LIBFDT) += libfdt/ endif -- cgit v1.2.1