Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / dts / Kconfig

diff --git a/dts/Kconfig b/dts/Kconfig
index 09cfefbd35358adb5335fea0f2dc53eda94be99e..a04bb962af81c260d414c9d049a45643ce72cc3b 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -14,9 +14,9 @@ config OF_CONTROL
          This feature provides for run-time configuration of U-Boot
          via a flattened device tree.
 
-config SPL_DISABLE_OF_CONTROL
-       bool "Disable run-time configuration via Device Tree in SPL"
-       depends on OF_CONTROL
+config SPL_OF_CONTROL
+       bool "Enable run-time configuration via Device Tree in SPL"
+       depends on SPL && OF_CONTROL
        help
          Some boards use device tree in U-Boot but only have 4KB of SRAM
          which is not enough to support device tree. Enable this option to
@@ -58,7 +58,7 @@ config DEFAULT_DEVICE_TREE
 
 config OF_SPL_REMOVE_PROPS
        string "List of device tree properties to drop for SPL"
-       depends on OF_CONTROL && SPL
+       depends on SPL_OF_CONTROL
        default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent"
        help
          Since SPL normally runs in a reduced memory space, the device tree