Correct SPL uses of FASTBOOT_FLASH_MMC
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>
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 67a9479..5a3fb69 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -295,7 +295,7 @@
*/
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 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 7563650..57b6182 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -99,7 +99,7 @@
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 bcef8f8..de4879d 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -62,7 +62,7 @@
.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 @@
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)