summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorZong Li <zong.li@sifive.com>2021-07-27 17:06:59 +0800
committerLeo Yu-Chi Liang <ycliang@andestech.com>2021-08-17 19:28:37 +0800
commit47d73ba4f4a40f17622d93f96b48e285b73c3061 (patch)
tree62f978c3d380e56c69f407f68d61799c52c9a06f /board
parent87e84818857db1d710002217eea66bb3596f5571 (diff)
downloadu-boot-47d73ba4f4a40f17622d93f96b48e285b73c3061.tar.gz
board: sifive: overwrite board_fdt_blob_setup in u-boot proper
Add board_fdt_blob_setup to return the device tree location which is passed by prior stage in u-boot proper. The generic board_fdt_blob_setup always returns _end, it mignt be ok because u-boot SPL would currently put the dtb there, but it would be broken if we put the dtb to another place and assigned the location into a1 register for u-boot proper. Use the location passed by prior stage would make more sence, because we actually pass the location to u-boot proper and want to use that one, rather than the dtb which in _end. We can't use CONFIG_OF_PRIOR_STAGE because it doens't distinguish the implementation of u-boot SPL and u-boot proper, so u-boot SPL need to reply on the prior stage to pass device tree location as well, but we don't pass the DT from boot rom now. In addition, when CONFIG_OF_PRIOR_STAGE is enabled, the u-boot-spl.bin and u-boot.itb won't include the device tree. Signed-off-by: Zong Li <zong.li@sifive.com> Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
Diffstat (limited to 'board')
-rw-r--r--board/sifive/unleashed/unleashed.c11
-rw-r--r--board/sifive/unmatched/unmatched.c11
2 files changed, 22 insertions, 0 deletions
diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c
index a4e78220cb..fa65fcade0 100644
--- a/board/sifive/unleashed/unleashed.c
+++ b/board/sifive/unleashed/unleashed.c
@@ -16,6 +16,7 @@
#include <misc.h>
#include <spl.h>
#include <asm/arch/cache.h>
+#include <asm/sections.h>
/*
* This define is a value used for error/unknown serial.
@@ -113,6 +114,16 @@ int misc_init_r(void)
#endif
+void *board_fdt_blob_setup(void)
+{
+ if (IS_ENABLED(CONFIG_OF_SEPARATE)) {
+ if (gd->arch.firmware_fdt_addr)
+ return (ulong *)gd->arch.firmware_fdt_addr;
+ else
+ return (ulong *)&_end;
+ }
+}
+
int board_init(void)
{
int ret;
diff --git a/board/sifive/unmatched/unmatched.c b/board/sifive/unmatched/unmatched.c
index 6d60559588..da23a6ce24 100644
--- a/board/sifive/unmatched/unmatched.c
+++ b/board/sifive/unmatched/unmatched.c
@@ -9,6 +9,17 @@
#include <common.h>
#include <dm.h>
#include <asm/arch/cache.h>
+#include <asm/sections.h>
+
+void *board_fdt_blob_setup(void)
+{
+ if (IS_ENABLED(CONFIG_OF_SEPARATE)) {
+ if (gd->arch.firmware_fdt_addr)
+ return (ulong *)gd->arch.firmware_fdt_addr;
+ else
+ return (ulong *)&_end;
+ }
+}
int board_init(void)
{