Correct SPL uses of FASTBOOT_FLASH_NAND

This converts 3 usages of this option to the non-SPL form, since there is
no SPL_FASTBOOT_FLASH_NAND 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 5a3fb69b3f7bf8035ee6a03b5a806f7237180309..71cfaec6e9dcabe9a303b33bcb9a40cb04fe512f 100644 (file)
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -299,7 +299,7 @@ static void __maybe_unused flash(char *cmd_parameter, char *response)
                fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr,
                                         image_size, response);
 
-       if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND))
+       if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND))
                fastboot_nand_flash_write(cmd_parameter, fastboot_buf_addr,
                                          image_size, response);
 }
@@ -318,7 +318,7 @@ static void __maybe_unused erase(char *cmd_parameter, char *response)
        if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
                fastboot_mmc_erase(cmd_parameter, response);
 
-       if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND))
+       if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND))
                fastboot_nand_erase(cmd_parameter, response);
 }
 

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index de4879dadfb43cc6e34338a5a82cc9ea3ab7c8f8..dd3475e0a8bd1afefe61a91534b0a8d1fee2bc38 100644 (file)
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -104,7 +104,7 @@ static int getvar_get_part_info(const char *part_name, char *response,
                                               response);
                if (r >= 0 && size)
                        *size = disk_part.size * disk_part.blksz;
-       } else if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) {
+       } else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) {
                r = fastboot_nand_get_part_info(part_name, &part_info, response);
                if (r >= 0 && size)
                        *size = part_info->size;