diff options
| author | Simon Glass <sjg@chromium.org> | 2021-12-16 20:59:21 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-23 10:24:39 -0500 |
| commit | 836eac7c6fe33a5dede7806db82386cc205734f0 (patch) | |
| tree | cc885295fa0b953e2a3a70b3818749cf363f49d1 /dts | |
| parent | 975e0e04bbd58b39ad8ad517e20aaaf46eebe2bf (diff) | |
| download | u-boot-836eac7c6fe33a5dede7806db82386cc205734f0.tar.gz | |
fdt: Make OF_BOARD a bool option
This should not be a separate option from OF_SEPARATE. It is a run-time
option to override the devicetree, even if present.
Move the option out of the choice.
Disable BINMAN_FDT for a few boards which don't actually use it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'dts')
| -rw-r--r-- | dts/Kconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dts/Kconfig b/dts/Kconfig index b7c4a2fec0..9994ab13dc 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -97,11 +97,9 @@ config OF_LIVE choice prompt "Provider of DTB for DT control" depends on OF_CONTROL - default OF_BOARD if SANDBOX config OF_SEPARATE bool "Separate DTB for DT control" - depends on !SANDBOX help If this option is enabled, the device tree will be built and placed as a separate u-boot.dtb file alongside the U-Boot image. @@ -114,14 +112,17 @@ config OF_EMBED and development only and is not recommended for production devices. Boards in the mainline U-Boot tree should not use it. +endchoice + config OF_BOARD bool "Provided by the board (e.g a previous loader) at runtime" + default y if 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. + the board at runtime if the board supports it. The device tree bundled + with the image (if any) will be overridden / ignored. -endchoice + A device tree file must be provided in the tree. config DEFAULT_DEVICE_TREE string "Default Device Tree for DT control" |