summaryrefslogtreecommitdiffstats
path: root/dts/Kconfig
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-10-14 10:46:36 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-10-14 10:46:36 +0200
commit13a3972585af60ec367d209cedbd3601e0c77467 (patch)
tree4b3312669b3e501f6bc10b39d8c7bbf516f07aac /dts/Kconfig
parent208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff)
parent297faccca2235e359012118495b9b73451d54bb9 (diff)
downloadtalos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.tar.gz
talos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.zip
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'dts/Kconfig')
-rw-r--r--dts/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/dts/Kconfig b/dts/Kconfig
index a04bb962af..fb2d79edbc 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -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"
@@ -59,6 +61,7 @@ config DEFAULT_DEVICE_TREE
config OF_SPL_REMOVE_PROPS
string "List of device tree properties to drop for 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
OpenPOWER on IntegriCloud