From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Fri, 15 Jun 2018 05:06:00 +0000 (+0000)
Subject: net: fastboot: Fix build when FASTBOOT_FLASH is disabled
X-Git-Tag: v2018.07-rc3~1^2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6dc73df73b2b95ec171d82558c2a0ed1437d8c0a;p=oweals%2Fu-boot.git

net: fastboot: Fix build when FASTBOOT_FLASH is disabled

When building without FASTBOOT_FLASH we don't include the intermediate
update callback to keep the client alive, so ensure we don't try setting
it here.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/net/fastboot.c b/net/fastboot.c
index a9f7c0743d..8afc5529cd 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -309,7 +309,9 @@ void fastboot_start_server(void)
 
 	fastboot_our_port = WELL_KNOWN_PORT;
 
+#if CONFIG_IS_ENABLED(FASTBOOT_FLASH)
 	fastboot_set_progress_callback(fastboot_timed_send_info);
+#endif
 	net_set_udp_handler(fastboot_handler);
 
 	/* zero out server ether in case the server ip has changed */