This converts 5 usages of this option to the non-SPL form, since there is no SPL_FASTBOOT_FLASH_MMC defined in Kconfig
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com ---
(no changes since v1)
drivers/fastboot/fb_command.c | 4 ++-- drivers/fastboot/fb_common.c | 2 +- drivers/fastboot/fb_getvar.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 67a94798287..5a3fb69b3f7 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -295,7 +295,7 @@ void fastboot_data_complete(char *response) */ static void __maybe_unused flash(char *cmd_parameter, char *response) { - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response);
@@ -315,7 +315,7 @@ static void __maybe_unused flash(char *cmd_parameter, char *response) */ static void __maybe_unused erase(char *cmd_parameter, char *response) { - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_erase(cmd_parameter, response);
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 7563650d07d..57b6182c46a 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -99,7 +99,7 @@ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) const int mmc_dev = config_opt_enabled(CONFIG_FASTBOOT_FLASH_MMC, CONFIG_FASTBOOT_FLASH_MMC_DEV, -1);
- if (!CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (!IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) return -EINVAL;
if (reason >= FASTBOOT_REBOOT_REASONS_COUNT) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index bcef8f866f3..de4879dadfb 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -62,7 +62,7 @@ static const struct { .variable = "has-slot", .dispatch = getvar_has_slot #endif -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) }, { .variable = "partition-type", .dispatch = getvar_partition_type @@ -99,7 +99,7 @@ static int getvar_get_part_info(const char *part_name, char *response, struct disk_partition disk_part; struct part_info *part_info;
- if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) { + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) { r = fastboot_mmc_get_part_info(part_name, &dev_desc, &disk_part, response); if (r >= 0 && size)