From 2e8d2f88439d7437f04a6af1d206270f9a2240d3 Mon Sep 17 00:00:00 2001 From: Ilias Apalodimas Date: Tue, 12 Oct 2021 00:00:13 +0300 Subject: riscv: Remove OF_PRIOR_STAGE from RISC-V boards At some point back in 2018 prior_stage_fdt_address and OF_PRIOR_STAGE got introduced, in order to support a DTB handed over by an earlier stage boo loader. However we have another option in the Kconfig (OF_BOARD) which has identical semantics. On RISC-V some of the boards pick up the DTB from a1 and copy it in their private gd_t. Apart from that they copy it to prior_stage_fdt_address, if the Kconfig option is selected, which is unnecessary. So let's switch the config option for those boards to OF_BOARD and define the required board_fdt_blob_setup() for them. Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass Reviewed-by: Leo Yu-Chi Liang --- board/emulation/qemu-riscv/qemu-riscv.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'board/emulation') diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c index dcfd3f20be..2a26e265ff 100644 --- a/board/emulation/qemu-riscv/qemu-riscv.c +++ b/board/emulation/qemu-riscv/qemu-riscv.c @@ -14,6 +14,8 @@ #include #include +DECLARE_GLOBAL_DATA_PTR; + int board_init(void) { /* @@ -69,3 +71,9 @@ int board_fit_config_name_match(const char *name) return 0; } #endif + +void *board_fdt_blob_setup(void) +{ + /* Stored the DTB address there during our init */ + return (void *)(ulong)gd->arch.firmware_fdt_addr; +} -- cgit v1.2.3