]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Correct SPL uses of CMD_BOOTM_PRE_LOAD
authorSimon Glass <sjg@chromium.org>
Sun, 5 Feb 2023 22:36:24 +0000 (15:36 -0700)
committerTom Rini <trini@konsulko.com>
Thu, 9 Feb 2023 21:32:25 +0000 (16:32 -0500)
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

index e6715ae6b14c2a119834d462bac583edf916b518..56b82bbb8b7439efbf9c6b5bc09c2e7c42b3cb08 100644 (file)
@@ -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);