Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR
authorSimon Glass <sjg@chromium.org>
Mon, 6 Feb 2023 00:55:03 +0000 (17:55 -0700)
committerTom Rini <trini@konsulko.com>
Fri, 10 Feb 2023 12:41:40 +0000 (07:41 -0500)
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_SAVE_PREV_BL_INITRAMFS_START_ADDR defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
arch/arm/lib/save_prev_bl_data.c
common/board_r.c

index cd943ee..f7b23fa 100644 (file)
@@ -62,7 +62,7 @@ int save_prev_bl_data(void)
 
        if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR))
                env_set_addr("prevbl_fdt_addr", (void *)reg0);
-       if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR))
+       if (!IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR))
                return 0;
 
        node = fdt_path_offset(fdt_blob, "/chosen");
index 6026e43..c6c0c1a 100644 (file)
@@ -452,7 +452,7 @@ static int initr_env(void)
                env_set_hex("fdtcontroladdr",
                            (unsigned long)map_to_sysmem(gd->fdt_blob));
 
-       #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \
+       #if (IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR) || \
                                                IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR))
                save_prev_bl_data();
        #endif