]> git.dujemihanovic.xyz Git - u-boot.git/commit
riscv: sifive: Fix OF_BOARD boot failure
authorBin Meng <bmeng.cn@gmail.com>
Wed, 5 Jan 2022 01:07:57 +0000 (09:07 +0800)
committerTom Rini <trini@konsulko.com>
Fri, 7 Jan 2022 14:30:44 +0000 (09:30 -0500)
commitf77549fe7459d7a44714dfc7af1f71e5ad68cbe6
treee82ff16d596ce20d5321478e36bf8d24597a2499
parentdae0829c6e98c274864496b019ae6d9c4bb94374
riscv: sifive: Fix OF_BOARD boot failure

When using QEMU to have a quick test of booting U-Boot S-mode payload
directly without the needs of preparing the SPI flash or SD card images
for SiFive Unleashed board, as per the instructions [1], it currently
does not boot any more.

This was caused by the OF_PRIOR_STAGE removal, as gd->fdt_blob no longer
points to a valid DTB. OF_BOARD is supposed to replace OF_PRIOR_STAGE,
hence we need to add the OF_BOARD logic in board_fdt_blob_setup().

[1] https://qemu.readthedocs.io/en/latest/system/riscv/sifive_u.html#running-u-boot

Fixes: 2e8d2f88439d ("riscv: Remove OF_PRIOR_STAGE from RISC-V boards")
Fixes: d6f8ab30a2af ("treewide: Remove OF_PRIOR_STAGE")
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
board/sifive/unleashed/unleashed.c
board/sifive/unmatched/unmatched.c