From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
To: trini@konsulko.com
Cc: mark.kettenis@xs4all.nl,
"Ilias Apalodimas" <ilias.apalodimas@linaro.org>,
"Bharat Gooty" <bharat.gooty@broadcom.com>,
"Rayagonda Kokatanur" <rayagonda.kokatanur@broadcom.com>,
"Rick Chen" <rick@andestech.com>, Leo <ycliang@andestech.com>,
"Thomas Fitzsimmons" <fitzsim@fitzsim.org>,
"Simon Glass" <sjg@chromium.org>, "Bin Meng" <bmeng.cn@gmail.com>,
"Green Wan" <green.wan@sifive.com>,
"Marek Behún" <marek.behun@nic.cz>,
"Sean Anderson" <seanga2@gmail.com>, "Lukas Auer" <lukas@auer.io>,
"Brad Kim" <brad.kim@semifive.com>,
"Zong Li" <zong.li@sifive.com>,
"Heinrich Schuchardt" <xypron.glpk@gmx.de>,
"Dimitri John Ledkov" <dimitri.ledkov@canonical.com>,
"David Abdurachmanov" <david.abdurachmanov@sifive.com>,
u-boot@lists.denx.de
Subject: [PATCH 3/3] treewide: Remove OF_PRIOR_STAGE
Date: Mon, 27 Sep 2021 09:47:48 +0300 [thread overview]
Message-ID: <20210927064751.78591-3-ilias.apalodimas@linaro.org> (raw)
In-Reply-To: <20210927064751.78591-1-ilias.apalodimas@linaro.org>
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>
---
dts/Kconfig | 11 ++---------
include/fdtdec.h | 4 ----
lib/fdtdec.c | 2 --
tools/binman/binman.rst | 16 ++++++----------
4 files changed, 8 insertions(+), 25 deletions(-)
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)
----------------------------------------------------
--
2.33.0
next prev parent reply other threads:[~2021-09-27 6:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 6:47 [PATCH 1/3] treewide: Remove OF_PRIOR_STAGE from RISC-V boards Ilias Apalodimas
2021-09-27 6:47 ` [PATCH 2/3] board: arm: Remove OF_PRIOR_STAGE Ilias Apalodimas
2021-09-27 20:15 ` Simon Glass
2021-09-27 6:47 ` Ilias Apalodimas [this message]
2021-09-27 20:15 ` [PATCH 3/3] treewide: " Simon Glass
2021-09-27 20:14 ` [PATCH 1/3] treewide: Remove OF_PRIOR_STAGE from RISC-V boards Simon Glass
2021-09-29 8:33 ` Zong Li
2021-09-29 9:02 ` Ilias Apalodimas
2021-09-29 10:17 ` Ilias Apalodimas
2021-09-29 11:51 ` Zong Li
2021-09-29 12:55 ` Ilias Apalodimas
2021-09-29 12:59 ` Mark Kettenis
2021-09-29 13:11 ` Ilias Apalodimas
2021-09-30 6:41 [PATCH 1/3 v2] riscv: " Ilias Apalodimas
2021-09-30 6:41 ` [PATCH 3/3] treewide: Remove OF_PRIOR_STAGE Ilias Apalodimas
2021-09-30 7:17 [PATCH 1/3 v3] riscv: Remove OF_PRIOR_STAGE from RISC-V boards Ilias Apalodimas
2021-09-30 7:17 ` [PATCH 3/3] treewide: Remove OF_PRIOR_STAGE Ilias Apalodimas
2021-10-11 21:00 [PATCH 1/3 v4] riscv: Remove OF_PRIOR_STAGE from RISC-V boards Ilias Apalodimas
2021-10-11 21:00 ` [PATCH 3/3] treewide: Remove OF_PRIOR_STAGE Ilias Apalodimas
2021-10-11 21:31 ` Simon Glass
2021-10-11 21:39 ` Ilias Apalodimas
2021-10-19 13:08 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210927064751.78591-3-ilias.apalodimas@linaro.org \
--to=ilias.apalodimas@linaro.org \
--cc=bharat.gooty@broadcom.com \
--cc=bmeng.cn@gmail.com \
--cc=brad.kim@semifive.com \
--cc=david.abdurachmanov@sifive.com \
--cc=dimitri.ledkov@canonical.com \
--cc=fitzsim@fitzsim.org \
--cc=green.wan@sifive.com \
--cc=lukas@auer.io \
--cc=marek.behun@nic.cz \
--cc=mark.kettenis@xs4all.nl \
--cc=rayagonda.kokatanur@broadcom.com \
--cc=rick@andestech.com \
--cc=seanga2@gmail.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
--cc=ycliang@andestech.com \
--cc=zong.li@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).