X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=dts%2FKconfig;h=fb2d79edbc3ba375944a997bc191cad4585a2a5a;hb=a1684b61054714daae7250e570fe3298f86605b7;hp=09cfefbd35358adb5335fea0f2dc53eda94be99e;hpb=3c9cc70d7153da442575112d9a2643eecd17d534;p=u-boot

diff --git a/dts/Kconfig b/dts/Kconfig
index 09cfefbd35..fb2d79edbc 100644
--- 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
@@ -37,7 +37,9 @@ config OF_EMBED
 	bool "Embedded DTB for DT control"
 	help
 	  If this option is enabled, the device tree will be picked up and
-	  built into the U-Boot image.
+	  built into the U-Boot image. This is suitable for local debugging
+	  and development only and is not recommended for production devices.
+	  Boards in the mainline U-Boot tree should not use it.
 
 config OF_HOSTFILE
 	bool "Host filed DTB for DT control"
@@ -58,7 +60,8 @@ 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 "clocks clock-names interrupt-parent" if SPL_PINCTRL_FULL
 	default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent"
 	help
 	  Since SPL normally runs in a reduced memory space, the device tree