riscv: ae350: Fix XIP config boot failure
PATCH 1/1 riscv: ae350: Fix XIP config boot failure
The booting flow is SPL -> OpenSBI -> U-Boot.
The boot hart may change after OpenSBI and may not always be hart0, so wrap the related branch instruction with M-MODE.
Current DTB setup for XIP is not valid.
There is no chance for CONFIG_SYS_FDT_BASE, the DTB address used in XIP mode, to be returned. Fix this.
Fixes 2e8d2f88439d ("riscv: Remove OF_PRIOR_STAGE from RISC-V boards")
Signed-off-by Rick Chen <[email protected]>
Signed-off-by Leo Yu-Chi Liang <[email protected]>
--- arch/riscv/cpu/start.S | 3 ++- board/AndesTech/ax25-ae350/ax25-ae350.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)
arch/riscv/cpu/start.S +2 -1
@@ -139,9 +139,10 @@ call_harts_early_init: * accesses gd). */ mv gp, s0 +#if CONFIG_IS_ENABLED(RISCV_MMODE) bnez tp, secondary_hart_loop #endif - +#endif jal board_init_f_init_reserve SREG s1, GD_FIRMWARE_FDT_ADDR(gp)
board/AndesTech/ax25-ae350/ax25-ae350.c +11 -6
@@ -54,17 +54,22 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)return 0 ; } +#define ANDES_HW_DTB_ADDRESS 0xF2000000void *board_fdt_blob_setup (int *err) { *err =0 ; -#if defined(CONFIG_OF_BOARD ) -return (void *)(ulong )gd->arch.firmware_fdt_addr; -#elif defined(CONFIG_OF_SEPARATE ) -return (void *)CONFIG_SYS_FDT_BASE ; -#else + +if (IS_ENABLED (CONFIG_OF_SEPARATE ) ||IS_ENABLED (CONFIG_OF_BOARD )) { +if (gd->arch.firmware_fdt_addr) +return (void *)(ulong )gd->arch.firmware_fdt_addr; + } + +if (fdt_magic (CONFIG_SYS_FDT_BASE ) ==FDT_MAGIC ) +return (void *)CONFIG_SYS_FDT_BASE ; +return (void *)ANDES_HW_DTB_ADDRESS ; + *err = -EINVAL ;return NULL ; -#endif }int smc_init (void )
Signature · 1 line
2.34.1.390.g2ae0a9cb82