aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2023-01-29 18:30:22 +0200
committerTom Rini <trini@konsulko.com>2023-03-07 19:25:37 -0500
commit4de41aefd57b02bada6dce2bc95b0a16d15ce834 (patch)
tree8c7950332ab0d88bf928348d499f0cc23036812f
parent3b3c870d87476c1bdcfe5fc762a01d926a4e5365 (diff)
downloadu-boot-WIP/2023-03-07-enable-fdt-overlay-more-widely.tar.gz
lib/Kconfig: Enable OF_LIBFDT_OVERLAY by default when FIT is enabledWIP/2023-03-07-enable-fdt-overlay-more-widely
FIT image support is commonly used to bundle a kernel image, a device tree, and device tree overlays. Applying overlays requires the OF_LIBFDT_OVERLAY config option to be set, which lots of boards fail to select, most likely because developers never noticed. This leads to an error when trying to apply overlays: "config with overlays but CONFIG_OF_LIBFDT_OVERLAY not set" TI ARM boards select the option by default. Extend this to all systems that select the FIT option. This only affects the default, overlay support can still be disabled manually in the configuration. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de> [trini: Disable on turris_omnia and bk4r1] Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--configs/bk4r1_defconfig1
-rw-r--r--configs/turris_omnia_defconfig1
-rw-r--r--lib/Kconfig2
3 files changed, 3 insertions, 1 deletions
diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig
index 66adeac725c..de12506a3d1 100644
--- a/configs/bk4r1_defconfig
+++ b/configs/bk4r1_defconfig
@@ -91,4 +91,5 @@ CONFIG_FSL_LPUART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_FSL_QSPI=y
+# CONFIG_OF_LIBFDT_OVERLAY is not set
# CONFIG_EFI_LOADER is not set
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index 67837865971..5f3155f22b5 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -118,3 +118,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_WDT=y
CONFIG_WDT_ORION=y
CONFIG_EXT4_WRITE=y
+# CONFIG_OF_LIBFDT_OVERLAY is not set
diff --git a/lib/Kconfig b/lib/Kconfig
index 4278b240554..0f12502ce3a 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -853,7 +853,7 @@ config OF_LIBFDT_ASSUME_MASK
config OF_LIBFDT_OVERLAY
bool "Enable the FDT library overlay support"
depends on OF_LIBFDT
- default y if ARCH_OMAP2PLUS || ARCH_KEYSTONE
+ default y if FIT
help
This enables the FDT library (libfdt) overlay support.