aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-02-05 15:40:44 -0700
committerTom Rini <trini@konsulko.com>2023-02-10 07:41:40 -0500
commit10f8bc09837968fd1264aae915ba135e1b4b6e5d (patch)
tree96e6fec37c0b5a1b1e3fd80deb444a460e8e8c50
parent4051c400c5021b798305499016df1c058e61c209 (diff)
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>
-rw-r--r--arch/arm/lib/save_prev_bl_data.c2
-rw-r--r--common/board_r.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c
index f4ee86a89c..cd943eefe1 100644
--- 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 90e1219fb9..6026e4367c 100644
--- 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