Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR

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>

diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c
index cd943eefe109e808a2294b80451375954a17b324..f7b23faf0d66624d957503b2cc7d6e332f9a2fbf 100644 (file)
--- a/arch/arm/lib/save_prev_bl_data.c
+++ b/arch/arm/lib/save_prev_bl_data.c
@@ -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");

diff --git a/common/board_r.c b/common/board_r.c
index 6026e4367ce9e9a0a33b62feda6bd8f81d44bf72..c6c0c1ab1d9439ec914fb6e11095b9374ebd5e30 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -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