From: Simon Glass <sjg@chromium.org>
Date: Sun, 5 Feb 2023 22:40:44 +0000 (-0700)
Subject: Correct SPL uses of SAVE_PREV_BL_FDT_ADDR
X-Git-Tag: v2025.01-rc5-pxa1908~1114^2~40
X-Git-Url: http://git.dujemihanovic.xyz/%22bddb.css/static/%7B%7B%20%24style.RelPermalink%20%7D%7D?a=commitdiff_plain;h=10f8bc09837968fd1264aae915ba135e1b4b6e5d;p=u-boot.git

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 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