dts: Allow OF_LIST to depend on FIT_EMBED

[people/ms/u-boot.git] / dts / Kconfig

diff --git a/dts/Kconfig b/dts/Kconfig
index 3f64eda61910a04174672af64df7c010455b096a..1bc9656faee6565563bac204a29e6efac2320ac1 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -32,6 +32,17 @@ config SPL_OF_CONTROL
          which is not enough to support device tree. Enable this option to
          allow such boards to be supported by U-Boot SPL.
 
+config OF_LIVE
+       bool "Enable use of a live tree"
+       depends on OF_CONTROL
+       help
+         Normally U-Boot uses a flat device tree which saves space and
+         avoids the need to unpack the tree before use. However a flat
+         tree does not support modifcation from within U-Boot since it
+         can invalidate driver-model device tree offsets. This option
+         enables a live tree which is available after relocation,
+         and can be adjusted as needed.
+
 choice
        prompt "Provider of DTB for DT control"
        depends on OF_CONTROL
@@ -51,6 +62,14 @@ config OF_EMBED
          and development only and is not recommended for production devices.
          Boards in the mainline U-Boot tree should not use it.
 
+config OF_BOARD
+       bool "Provided by the board at runtime"
+       depends on !SANDBOX
+       help
+         If this option is enabled, the device tree will be provided by
+         the board at runtime if the board supports it, instead of being
+         bundled with the image.
+
 config OF_HOSTFILE
        bool "Host filed DTB for DT control"
        depends on SANDBOX
@@ -71,20 +90,21 @@ config DEFAULT_DEVICE_TREE
 
 config OF_LIST
        string "List of device tree files to include for DT control"
-       depends on SPL_LOAD_FIT
+       depends on SPL_LOAD_FIT || FIT_EMBED
        default DEFAULT_DEVICE_TREE
        help
          This option specifies a list of device tree files to use for DT
-         control. These will be packaged into a FIT. At run-time, SPL will
-         select the correct DT to use by examining the hardware (e.g.
-         reading a board ID value). This is a list of device tree files
-         (without the directory or .dtb suffix) separated by <space>.
+         control. These will be packaged into a FIT. At run-time, U-boot
+         or SPL will select the correct DT to use by examining the
+         hardware (e.g. reading a board ID value). This is a list of
+         device tree files (without the directory or .dtb suffix)
+         separated by <space>.
 
 config OF_SPL_REMOVE_PROPS
        string "List of device tree properties to drop for SPL"
        depends on SPL_OF_CONTROL
-       default "interrupt-parent" if SPL_PINCTRL_FULL && SPL_CLK
-       default "clocks clock-names interrupt-parent" if SPL_PINCTRL_FULL
+       default "interrupt-parent" if SPL_PINCTRL && SPL_CLK
+       default "clocks clock-names interrupt-parent" if SPL_PINCTRL
        default "pinctrl-0 pinctrl-names interrupt-parent" if SPL_CLK
        default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent"
        help