fdt: Drop CONFIG_BINMAN_STANDALONE_FDT

This was added as a hack to work around not having an in-tree devicetree.
Now that this is fixed it is not needed.

Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/Makefile b/Makefile
index 2badd260298b1fa166faa1c1e029fc4a6a232ead..633e038ffab261838c2584a9d489ed049882d35b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -945,7 +945,6 @@ endif
 endif
 INPUTS-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
 INPUTS-$(CONFIG_OF_SEPARATE) += u-boot.dtb
-INPUTS-$(CONFIG_BINMAN_STANDALONE_FDT) += u-boot.dtb
 ifeq ($(CONFIG_SPL_FRAMEWORK),y)
 INPUTS-$(CONFIG_OF_SEPARATE) += u-boot-dtb.img
 endif
@@ -1415,7 +1414,7 @@ u-boot-lzma.img: u-boot.bin.lzma FORCE
 
 u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \
                $(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin \
-                       $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX)$(CONFIG_BINMAN_STANDALONE_FDT),dts/dt.dtb) \
+                       $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \
                ,$(UBOOT_BIN)) FORCE
        $(call if_changed,mkimage)
        $(BOARD_SIZE_CHECK)

diff --git a/dts/Kconfig b/dts/Kconfig
index 9994ab13dcba9501ce6e4802f9f4b631f2a80024..6ebbac2a649916be3af0d22fb64f3b898f04af63 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -16,24 +16,6 @@ config BINMAN
        bool
        select DTOC
 
-config BINMAN_STANDALONE_FDT
-       bool
-       depends on BINMAN
-       default y if OF_BOARD
-       help
-         This option tells U-Boot build system that a standalone device tree
-         source is explicitly required when using binman to package U-Boot.
-
-         This is not necessary in a common scenario where a device tree source
-         that contains the binman node is provided in the arch/<arch>/dts
-         directory for a specific board. Such device tree sources are built for
-         OF_SEPARATE or OF_EMBED. However for a scenario like the board device
-         tree blob is not provided in the U-Boot build tree, but fed to U-Boot
-         in the runtime, e.g.: in the OF_BOARD case that it is passed by
-         a prior stage bootloader. For such scenario, a standalone device tree
-         blob containing binman node to describe how to package U-Boot should
-         be provided explicitly.
-
 menu "Device Tree Control"
        depends on SUPPORT_OF_CONTROL
 

diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst
index 10389a52c4b57b97dff8a07f47056b5a38b5d70f..56f865800e62835c3cdfded2e351d33196a027cf 100644 (file)
--- a/tools/binman/binman.rst
+++ b/tools/binman/binman.rst
@@ -232,26 +232,6 @@ You can use other, more specific CONFIG options - see 'Automatic .dtsi
 inclusion' below.
 
 
-Using binman with OF_BOARD
---------------------------------------------
-
-Normally binman is used with a board configured with OF_SEPARATE or OF_EMBED.
-This is a typical scenario where a device tree source that contains the binman
-node is provided in the arch/<arch>/dts directory for a specific board.
-
-However for a board configured with OF_BOARD, no device tree blob is provided
-in the U-Boot build phase hence the binman node information is not available.
-In order to support such use case, a new Kconfig option BINMAN_STANDALONE_FDT
-is introduced, to tell the build system that a standalone device tree blob
-containing binman node is explicitly required.
-
-Note there is a Kconfig option BINMAN_FDT which enables U-Boot run time to
-access information about binman entries, stored in the device tree in a binman
-node. Generally speaking, this option makes sense for OF_SEPARATE or OF_EMBED.
-For the other OF_CONTROL methods, it's quite possible binman node is not
-available as binman is invoked during the build phase, thus this option is not
-turned on by default for these OF_CONTROL methods.
-
 Access to binman entry offsets at run time (symbols)
 ----------------------------------------------------