commit c19fee5939165f4e9abc6abc8f81d2b3588baf59
author Simon Glass <sjg@chromium.org> Sun Feb 05 17:55:03 2023 -0700
committer Tom Rini <trini@konsulko.com> Fri Feb 10 07:41:40 2023 -0500
tree 02a3a6f1f1344737b24d5d85be340e5ac881e181
parent 9e0417e02a46c6c59a8e7a6cc5779c8751d241a9

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>

arch/arm/lib/save_prev_bl_data.c

diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c
index cd943ee..f7b23fa 100644
--- a/arch/arm/lib/save_prev_bl_data.c
+++ b/arch/arm/lib/save_prev_bl_data.c
@@ -62,7 +62,7 @@
 
 	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");

common/board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 6026e43..c6c0c1a 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -452,7 +452,7 @@
 		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