OpenBLT: fix compilation without NET enabled

Author: dron0gus

firmware/bootloader/Makefile

@@ -203,26 +203,12 @@ CSRC =  $(ALLCSRC) \
 	$(PROJECT_DIR)/ext/openblt/Target/Source/backdoor.c \
 	$(PROJECT_DIR)/ext/openblt/Target/Source/boot.c \
 	$(PROJECT_DIR)/ext/openblt/Target/Source/com.c \
-	$(PROJECT_DIR)/ext/openblt/Target/Source/net.c \
 	$(PROJECT_DIR)/ext/openblt/Target/Source/xcp.c \
 	$(PROJECT_DIR)/ext/openblt/Target/Source/cop.c \
 	$(PROJECT_DIR)/bootloader/openblt_chibios/nvm.c \
 	$(PROJECT_DIR)/bootloader/openblt_chibios/clock-arch.c \
 	$(PROJECT_DIR)/hw_layer/openblt/hooks.c
 
-UIP_DIR = $(PROJECT_DIR)/ext/openblt/Target/Source/third_party/uip
-
-# Collect UIP third party library files
-UIP_CSRC = \
-	$(UIP_DIR)/uip/uip.c \
-	$(UIP_DIR)/uip/uip_arp.c \
-	$(UIP_DIR)/uip/uip_timer.c \
-	$(UIP_DIR)/uip/uiplib.c \
-	$(UIP_DIR)/apps/dhcpc/dhcpc.c \
-	$(PROJECT_DIR)/hw_layer/openblt/netdev.c
-
-CSRC += $(UIP_CSRC)
-
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # todo: reduce code duplication with primary Makefile!!!
 # setting.
@@ -312,6 +298,27 @@ INCDIR += $(ALLINC) \
 	$(UIP_DIR)/apps/dhcpc \
 	config
 
+ifeq ($(EFI_ETHERNET),yes)
+	UIP_DIR = $(PROJECT_DIR)/ext/openblt/Target/Source/third_party/uip
+
+	# Collect network and UIP third party library files
+	UIP_CSRC = \
+		$(UIP_DIR)/uip/uip.c \
+		$(UIP_DIR)/uip/uip_arp.c \
+		$(UIP_DIR)/uip/uip_timer.c \
+		$(UIP_DIR)/uip/uiplib.c \
+		$(UIP_DIR)/apps/dhcpc/dhcpc.c \
+		$(PROJECT_DIR)/hw_layer/openblt/netdev.c
+
+	CSRC += \
+		$(PROJECT_DIR)/ext/openblt/Target/Source/net.c \
+		$(UIP_CSRC)
+
+	INCDIR += \
+		$(UIP_DIR)/uip \
+		$(UIP_DIR)/apps/dhcpc
+endif
+
 BUILDDIR=blbuild
 
 #

firmware/config/boards/nucleo_f767/board.mk

@@ -9,6 +9,7 @@ DDEFS += -DEFI_FILE_LOGGING=FALSE -DEFI_ALTERNATOR_CONTROL=FALSE -DEFI_LOGIC_ANA
 DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::B14
 
 # Enable ethernet
+EFI_ETHERNET = yes
 ifeq (,$(findstring EFI_BOOTLOADER,$(DDEFS)))
 	LWIP = yes
 	DDEFS += -DCH_CFG_USE_DYNAMIC=TRUE

firmware/hw_layer/openblt/blt_conf.h

@@ -121,7 +121,15 @@
 /** only USB supported, this is ignored but required */
 #define BOOT_COM_RS232_CHANNEL_INDEX 0
 
-#if (EFI_ETHERNET==TRUE)
+// TODO:
+//#define FALSE 0
+//#define TRUE 1
+
+#ifndef EFI_ETHERNET
+#define EFI_ETHERNET 0
+#endif
+
+#if (EFI_ETHERNET==1)
 /* The NET communication interface for firmware updates via TCP/IP is selected by setting
  * the BOOT_COM_NET_ENABLE configurable to 1. The maximum amount of data bytes in a
  * message for data transmission and reception is set through BOOT_COM_NET_TX_MAX_DATA
@@ -176,6 +184,8 @@
  *         by calling ComDeferredInit().
  */
 #define BOOT_COM_NET_DEFERRED_INIT_ENABLE (1)
+#else
+#define BOOT_COM_NET_ENABLE               (0)
 #endif // EFI_ETHERNET
 
 /****************************************************************************************