From: Simon Glass <sjg@chromium.org>
Date: Mon, 6 Feb 2023 00:55:03 +0000 (-0700)
Subject: Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=4c77608942a4e84424cd2c19c90cd3b4f93f5d3d;p=u-boot.git

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 cd943eefe1..f7b23faf0d 100644
--- 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 6026e4367c..c6c0c1ab1d 100644
--- 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