Correct SPL uses of FASTBOOT_FLASH

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

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 2fbd285db384118b2f813a0ed1fa20058dabe0d1..bcef8f866f33e4509829e19ac27b4608170eee6e 100644 (file)
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -57,7 +57,7 @@ static const struct {
        }, {
                .variable = "current-slot",
                .dispatch = getvar_current_slot
-#if CONFIG_IS_ENABLED(FASTBOOT_FLASH)
+#if IS_ENABLED(CONFIG_FASTBOOT_FLASH)
        }, {
                .variable = "has-slot",
                .dispatch = getvar_has_slot
@@ -67,7 +67,7 @@ static const struct {
                .variable = "partition-type",
                .dispatch = getvar_partition_type
 #endif
-#if CONFIG_IS_ENABLED(FASTBOOT_FLASH)
+#if IS_ENABLED(CONFIG_FASTBOOT_FLASH)
        }, {
                .variable = "partition-size",
                .dispatch = getvar_partition_size

diff --git a/net/fastboot.c b/net/fastboot.c
index 96bdf5486fa6c9922434d77c29972490ba7770f7..e9569d88d2a798c3b345bffa34c682d1732d577b 100644 (file)
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -307,7 +307,7 @@ void fastboot_start_server(void)
 
        fastboot_our_port = CONFIG_UDP_FUNCTION_FASTBOOT_PORT;
 
-       if (CONFIG_IS_ENABLED(FASTBOOT_FLASH))
+       if (IS_ENABLED(CONFIG_FASTBOOT_FLASH))
                fastboot_set_progress_callback(fastboot_timed_send_info);
 
        net_set_udp_handler(fastboot_handler);