Correct SPL uses of SAVE_PREV_BL_FDT_ADDR

This converts 2 usages of this option to the non-SPL form, since there is
no SPL_SAVE_PREV_BL_FDT_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 f4ee86a89c60c61f37aa97fa02a1523ba72e25ab..cd943eefe109e808a2294b80451375954a17b324 100644 (file)
--- a/arch/arm/lib/save_prev_bl_data.c
+++ b/arch/arm/lib/save_prev_bl_data.c
@@ -60,7 +60,7 @@ int save_prev_bl_data(void)
                return -ENODATA;
        }
 
-       if (CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR))
+       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))
                return 0;

diff --git a/common/board_r.c b/common/board_r.c
index 90e1219fb967052962d19cceb3100a16fc19511b..6026e4367ce9e9a0a33b62feda6bd8f81d44bf72 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -453,7 +453,7 @@ static int initr_env(void)
                            (unsigned long)map_to_sysmem(gd->fdt_blob));
 
        #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \
-                                               CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR))
+                                               IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR))
                save_prev_bl_data();
        #endif