[DistroKit] [PATCH 6/8] barebox: enable oftree fallback

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

Our bootloader spec files all list a devicetree, so enabling this
option won't change behavior for us, but is occasionally useful for
quick debugging, which is a primary use case for DistroKit.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/bsp.ref                     | 17 +++++++++++++++++
 configs/platform-v7a/barebox.config |  2 +-
 configs/platform-v8a/barebox.config |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/configs/bsp.ref b/configs/bsp.ref
index 7138cbccc0aa..86a2bdebe75a 100644
--- a/configs/bsp.ref
+++ b/configs/bsp.ref
@@ -39,6 +39,23 @@ kernel_initrd:
       value: True
     - value: False
 
+barebox_oftree_fallback:
+  description: |
+    barebox will substitute its own device tree when no kernel device
+    tree was supplied. This is useful for development, but not recommended
+    for use in production as DT binding breakage is not an infrequent
+    occurrence.
+
+    We take in DistroKit though to specify the DT when we specify a kernel,
+    so enable this option as it's occasionally helpful for quick debugging.
+  variants:
+    - condition: |
+        kconfig.have_barebox_config() and
+       (kconfig.BareboxConfig()['CONFIG_NAME'] == "multi_v7_defconfig" or
+        kconfig.BareboxConfig()['CONFIG_NAME'] == "multi_v8_defconfig")
+      value: False
+    - value: True
+
 barebox_arm_optimized_string_functions:
   description: |
     The use of assembler optimized memcpy / memset functions improves
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 9a1e6aa1383e..a303bb0c1005 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -353,7 +353,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_VERBOSE=y
 CONFIG_BOOTM_INITRD=y
 CONFIG_BOOTM_OFTREE=y
-# CONFIG_BOOTM_OFTREE_FALLBACK is not set
+CONFIG_BOOTM_OFTREE_FALLBACK=y
 CONFIG_BOOTM_UIMAGE=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_AIMAGE is not set
diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config
index efe1d73c6dc7..d2fd4e9cf814 100644
--- a/configs/platform-v8a/barebox.config
+++ b/configs/platform-v8a/barebox.config
@@ -275,7 +275,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_VERBOSE=y
 CONFIG_BOOTM_INITRD=y
 CONFIG_BOOTM_OFTREE=y
-# CONFIG_BOOTM_OFTREE_FALLBACK is not set
+CONFIG_BOOTM_OFTREE_FALLBACK=y
 CONFIG_BOOTM_UIMAGE=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_AIMAGE is not set
-- 
2.47.3