diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-26 09:50:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-26 09:50:46 -0400 |
| commit | 7a4b0bc5fe70225ae3595ba81d1473c06fd6b83b (patch) | |
| tree | 08de46c2eb44560654871f78380d4363efdce5ec /lib | |
| parent | 6f9656d726235b4cbb4f469a82c30e5006a75b53 (diff) | |
| parent | 44016bc59870c8816fe2cd4721dc5ff11038dd98 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-riscv
- Support SPL and OpenSBI (FW_DYNAMIC firmware) boot.
- Fix qemu kconfig build warning.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ef5e54875c9..74525c84e7b 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1535,16 +1535,14 @@ int fdtdec_setup(void) puts("Failed to read control FDT\n"); return -1; } +# elif defined(CONFIG_OF_PRIOR_STAGE) + gd->fdt_blob = (void *)prior_stage_fdt_address; # endif # ifndef CONFIG_SPL_BUILD /* Allow the early environment to override the fdt address */ -# if CONFIG_IS_ENABLED(OF_PRIOR_STAGE) - gd->fdt_blob = (void *)prior_stage_fdt_address; -# else gd->fdt_blob = map_sysmem (env_get_ulong("fdtcontroladdr", 16, (unsigned long)map_to_sysmem(gd->fdt_blob)), 0); -# endif # endif # if CONFIG_IS_ENABLED(MULTI_DTB_FIT) |