From: Randolph Date: Fri, 22 Mar 2024 11:36:37 +0000 (+0800) Subject: spl: riscv: opensbi: fix check of PAYLOAD_ARGS_ADDR X-Git-Url: http://git.dujemihanovic.xyz/html/static/%7B%7B%20.RelPermalink%20%7D%7D?a=commitdiff_plain;h=0cfe1bc6ed9b322d2b03ded3175ac5de3ed2b784;p=u-boot.git spl: riscv: opensbi: fix check of PAYLOAD_ARGS_ADDR When Falcon Mode is enabled on RISC-V, use CONFIG_VAL to check PAYLOAD_ARGS_ADDR, not CONFIG_IS_ENABLED. Fixes: 10c4ab898c25 ("spl: riscv: falcon: move fdt blob to specified address") Signed-off-by: Randolph Tested-by: Leo Yu-Chi Liang --- diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index 8127ebc946..ec62aab929 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -66,7 +66,7 @@ void __noreturn spl_invoke_opensbi(struct spl_image_info *spl_image) * Moving DTB in front of the kernel can avoid the error. */ #if CONFIG_IS_ENABLED(LOAD_FIT_OPENSBI_OS_BOOT) && \ - CONFIG_IS_ENABLED(PAYLOAD_ARGS_ADDR) + CONFIG_VAL(PAYLOAD_ARGS_ADDR) memcpy((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, spl_image->fdt_addr, fdt_totalsize(spl_image->fdt_addr)); spl_image->fdt_addr = map_sysmem(CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0);