]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
spl: riscv: opensbi: fix check of PAYLOAD_ARGS_ADDR
authorRandolph <randolph@andestech.com>
Fri, 22 Mar 2024 11:36:37 +0000 (19:36 +0800)
committerLeo Yu-Chi Liang <ycliang@andestech.com>
Tue, 26 Mar 2024 09:31:24 +0000 (17:31 +0800)
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 <randolph@andestech.com>
Tested-by: Leo Yu-Chi Liang <ycliang@andestech.com>
common/spl/spl_opensbi.c

index 8127ebc946b3edd45154abbe5bb9102cbde247a7..ec62aab929b9ccd7c9041785f98226e0dbf9fbf1 100644 (file)
@@ -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);