[PATCH 040/171] Correct SPL uses of CMD_BOOTM_PRE_LOAD

Simon Glass
2023-01-30T14:59:44Z

This converts 2 usages of this option to the non-SPL form, since there is
no SPL_CMD_BOOTM_PRE_LOAD defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
---

boot/bootm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/bootm.c b/boot/bootm.c
index e6715ae6b14..56b82bbb8b7 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -100,7 +100,7 @@ static int bootm_pre_load(struct cmd_tbl *cmdtp, int flag, int argc,
ulong data_addr = bootm_data_addr(argc, argv);
int ret = 0;

- if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD))
+ if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD))
ret = image_pre_load(data_addr);

if (ret)
@@ -893,7 +893,7 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc,
&fit_uname_config,
&fit_uname_kernel);

- if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD))
+ if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD))
img_addr += image_load_offset;

bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
--
2.39.1.456.gfc5497dd1b-goog