Merge branch 'master' of git://git.denx.de/u-boot-spi

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

diff --git a/dts/Kconfig b/dts/Kconfig
index daa757dd56631601faa437467ef26662e3ac97a9..8917f4244459210e258b23c222571b826b63f164 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -8,6 +8,17 @@ config SUPPORT_OF_CONTROL
 config DTC
        bool
 
+config PYLIBFDT
+       bool
+
+config DTOC
+       bool
+       select PYLIBFDT
+
+config BINMAN
+       bool
+       select DTOC
+
 menu "Device Tree Control"
        depends on SUPPORT_OF_CONTROL
 
@@ -50,7 +61,7 @@ config OF_LIVE
        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
+         tree does not support modification 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.
@@ -90,6 +101,13 @@ config OF_HOSTFILE
          This is only useful for Sandbox.  Use the -d flag to U-Boot to
          specify the file to read.
 
+config OF_PRIOR_STAGE
+       bool "Prior stage bootloader DTB for DT control"
+       help
+         If this option is enabled, the device tree used for DT
+         control will be read from a device tree binary, at a memory
+         location passed to U-Boot by the prior stage bootloader.
+
 endchoice
 
 config DEFAULT_DEVICE_TREE
@@ -184,7 +202,7 @@ config SPL_MULTI_DTB_FIT_NO_COMPRESSION
 endchoice
 
 choice
-       prompt "Location of uncompressed DTBs "
+       prompt "Location of uncompressed DTBs"
        depends on (SPL_MULTI_DTB_FIT_GZIP || SPL_MULTI_DTB_FIT_LZO)
        default SPL_MULTI_DTB_FIT_DYN_ALLOC if SYS_MALLOC_F
 
@@ -231,6 +249,7 @@ config OF_SPL_REMOVE_PROPS
 config SPL_OF_PLATDATA
        bool "Generate platform data for use in SPL"
        depends on SPL_OF_CONTROL
+       select DTOC
        help
          For very constrained SPL environments the overhead of decoding
          device tree nodes and converting their contents into platform data
@@ -252,6 +271,7 @@ config SPL_OF_PLATDATA
 config TPL_OF_PLATDATA
        bool "Generate platform data for use in TPL"
        depends on TPL_OF_CONTROL
+       select DTOC
        help
          For very constrained SPL environments the overhead of decoding
          device tree nodes and converting their contents into platform data