treewide: Remove OF_PRIOR_STAGE

The previous patches removed OF_PRIOR_STAGE from the last consumers of the
Kconfig option.  Cleanup any references to it in documentation,  code and
configuration options.

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/dts/Kconfig b/dts/Kconfig
index 7a297b2f0e507a98ee6d76738279a908007a7afd..fc4130545a924d7e7c70e7c04ba5ea1d8d449aff 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -22,7 +22,7 @@ config BINMAN
 config BINMAN_STANDALONE_FDT
        bool
        depends on BINMAN
-       default y if OF_BOARD || OF_PRIOR_STAGE
+       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.
@@ -32,7 +32,7 @@ config BINMAN_STANDALONE_FDT
          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_PRIOR_STAGE case that it is passed by
+         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.
@@ -133,13 +133,6 @@ 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

diff --git a/include/fdtdec.h b/include/fdtdec.h
index f94d1f4f3abeec8d4990d0f8d2e5444c28d11e94..239814228d73a0700019b578e252f0e6aa34c52d 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -55,10 +55,6 @@ struct bd_info;
 #define SPL_BUILD      0
 #endif
 
-#ifdef CONFIG_OF_PRIOR_STAGE
-extern phys_addr_t prior_stage_fdt_address;
-#endif
-
 /*
  * Information about a resource. start is the first address of the resource
  * and end is the last address (inclusive). The length of the resource will

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index ad090ea51eb5d46d433112bb8e258b43e95bd36a..959b337cdc82ad2fe77baafead6b7c4752c4e2cd 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1613,8 +1613,6 @@ int fdtdec_setup(void)
                puts("Failed to read control FDT\n");
                return -1;
        }
-# elif defined(CONFIG_OF_PRIOR_STAGE)
-       gd->fdt_blob = (void *)(uintptr_t)prior_stage_fdt_address;
 # endif
 # ifndef CONFIG_SPL_BUILD
        /* Allow the early environment to override the fdt address */

diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst
index 09e7b5719825da1f6504ae45c57fafb490c7b613..614df541c5acd003c11fdf2fd8785784ae6af279 100644 (file)
--- a/tools/binman/binman.rst
+++ b/tools/binman/binman.rst
@@ -232,18 +232,18 @@ You can use other, more specific CONFIG options - see 'Automatic .dtsi
 inclusion' below.
 
 
-Using binman with OF_BOARD or OF_PRIOR_STAGE
+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 or OF_PRIOR_STAGE, 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.
+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
@@ -252,10 +252,6 @@ 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.
 
-See qemu-riscv64_spl_defconfig for an example of how binman is used with
-OF_PRIOR_STAGE to generate u-boot.itb image.
-
-
 Access to binman entry offsets at run time (symbols)
 ----------------------------------------------------