[PATCH v2 136/169] Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR
Simon Glass
sjg at chromium.org
Mon Feb 6 01:55:03 CET 2023
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 at chromium.org>
---
(no changes since v1)
arch/arm/lib/save_prev_bl_data.c | 2 +-
common/board_r.c | 2 +-
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 cd943eefe10..f7b23faf0d6 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 6026e4367ce..c6c0c1ab1d9 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
--
2.39.1.519.gcb327c4b5f-goog
More information about the U-Boot
mailing list