diff mbox series

[3/3] treewide: Remove OF_PRIOR_STAGE

Message ID 20211011210016.135929-3-ilias.apalodimas@linaro.org
State Accepted
Commit d6f8ab30a2af4666732c2077df8f731076827b2e
Headers show
Series [1/3,v4] riscv: Remove OF_PRIOR_STAGE from RISC-V boards | expand

Commit Message

Ilias Apalodimas Oct. 11, 2021, 9 p.m. UTC 
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>

---
 dts/Kconfig             | 11 ++---------
 include/fdtdec.h        |  4 ----
 lib/fdtdec.c            |  2 --
 tools/binman/binman.rst | 16 ++++++----------
 4 files changed, 8 insertions(+), 25 deletions(-)

-- 
2.33.0

Comments

Simon Glass Oct. 11, 2021, 9:31 p.m. UTC | #1 
Hi Ilias,

On Mon, 11 Oct 2021 at 15:00, Ilias Apalodimas
<ilias.apalodimas@linaro.org> wrote:
>

> 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>

> ---

>  dts/Kconfig             | 11 ++---------

>  include/fdtdec.h        |  4 ----

>  lib/fdtdec.c            |  2 --

>  tools/binman/binman.rst | 16 ++++++----------

>  4 files changed, 8 insertions(+), 25 deletions(-)


Wasn't there a previous version of this patch?

Regards,
Simon
Ilias Apalodimas Oct. 11, 2021, 9:39 p.m. UTC | #2 
Hi Simon,


On Tue, 12 Oct 2021 at 00:31, Simon Glass <sjg@chromium.org> wrote:
>

> Hi Ilias,

>

> On Mon, 11 Oct 2021 at 15:00, Ilias Apalodimas

> <ilias.apalodimas@linaro.org> wrote:

> >

> > 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>

> > ---

> >  dts/Kconfig             | 11 ++---------

> >  include/fdtdec.h        |  4 ----

> >  lib/fdtdec.c            |  2 --

> >  tools/binman/binman.rst | 16 ++++++----------

> >  4 files changed, 8 insertions(+), 25 deletions(-)

>

> Wasn't there a previous version of this patch?


Yea I messed up the versioning apologies.
The first patch of this series is marked as v4 and has a changelog.
The 2 following patches have no changes wrt v3

Cheers
/Ilias
>

> Regards,

> Simon
Tom Rini Oct. 19, 2021, 1:08 p.m. UTC | #3 
On Tue, Oct 12, 2021 at 12:00:15AM +0300, Ilias Apalodimas wrote:

> 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>


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/dts/Kconfig b/dts/Kconfig
index 39270b47f9f0..100769017e12 100644
--- 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.
@@ -122,13 +122,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 8ac20c9a64f7..d0e13fc18313 100644
--- 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 7358cb6dd168..7b379564600d 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1580,8 +1580,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 09e7b5719825..614df541c5ac 100644
--- 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)
 ----------------------------------------------------