Merge branch 'master' into develop

8 files changed, 23 insertions, 9 deletions

diff --git a/examples/device/board_test/src/tusb_config.h b/examples/device/board_test/src/tusb_config.h
index 2f2a4deeb..1a52cc348 100644
--- a/examples/device/board_test/src/tusb_config.h
+++ b/examples/device/board_test/src/tusb_config.h
@@ -64,7 +64,9 @@
 // DEVICE CONFIGURATION
 //--------------------------------------------------------------------
 
+#ifndef CFG_TUD_ENDPOINT0_SIZE
 #define CFG_TUD_ENDPOINT0_SIZE   64
+#endif
 
 //------------- CLASS -------------//
 #define CFG_TUD_CDC             0
diff --git a/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx b/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx
diff --git a/examples/device/dfu_rt/src/tusb_config.h b/examples/device/dfu_rt/src/tusb_config.h
index 96c3a2468..d1efcdab5 100644
--- a/examples/device/dfu_rt/src/tusb_config.h
+++ b/examples/device/dfu_rt/src/tusb_config.h
@@ -51,7 +51,9 @@
 // DEVICE CONFIGURATION
 //--------------------------------------------------------------------
 
+#ifndef CFG_TUD_ENDPOINT0_SIZE
 #define CFG_TUD_ENDPOINT0_SIZE    64
+#endif
 
 //------------- CLASS -------------//
 
diff --git a/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx b/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx
new file mode 100644
index 000000000..17600f062
--- /dev/null
+++ b/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx
@@ -0,0 +1 @@
+too many warnings for 16-bit integer overflow
diff --git a/examples/device/net_lwip_webserver/Makefile b/examples/device/net_lwip_webserver/Makefile
index a153c30be..fa93cf87f 100644
--- a/examples/device/net_lwip_webserver/Makefile
+++ b/examples/device/net_lwip_webserver/Makefile
@@ -17,6 +17,8 @@ INC += \
 # Example source
 EXAMPLE_SOURCE += $(wildcard src/*.c)
 SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE))
+
+# lwip sources
 SRC_C += \
   lib/lwip/src/core/altcp.c \
   lib/lwip/src/core/altcp_alloc.c \
diff --git a/examples/device/usbtmc/src/tusb_config.h b/examples/device/usbtmc/src/tusb_config.h
index 5dddc2c46..b6a40355e 100644
--- a/examples/device/usbtmc/src/tusb_config.h
+++ b/examples/device/usbtmc/src/tusb_config.h
@@ -51,7 +51,9 @@
 // DEVICE CONFIGURATION
 //--------------------------------------------------------------------
 
+#ifndef CFG_TUD_ENDPOINT0_SIZE
 #define CFG_TUD_ENDPOINT0_SIZE    64
+#endif
 
 //------------- CLASS -------------//
 
diff --git a/examples/make.mk b/examples/make.mk
index 5bba1cde7..25b618896 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -3,10 +3,12 @@
 #
 
 # Compiler
-ifeq ($(BOARD), fomu)
-CROSS_COMPILE = riscv-none-embed-
+ifeq ($(BOARD), msp_exp430f5529lp)
+  CROSS_COMPILE = msp430-elf-
+else ifeq ($(BOARD), fomu)
+  CROSS_COMPILE = riscv-none-embed-
 else
-CROSS_COMPILE = arm-none-eabi-
+  CROSS_COMPILE = arm-none-eabi-
 endif
 CC = $(CROSS_COMPILE)gcc
 CXX = $(CROSS_COMPILE)g++
@@ -72,7 +74,6 @@ CFLAGS += \
 	-Wsign-compare \
 	-Wmissing-format-attribute \
 	-Wno-deprecated-declarations \
-	-Wnested-externs \
 	-Wunreachable-code \
 	-ffunction-sections \
 	-fdata-sections
diff --git a/examples/rules.mk b/examples/rules.mk
index 137063343..0343391cb 100644
--- a/examples/rules.mk
+++ b/examples/rules.mk
@@ -30,10 +30,14 @@ INC += $(TOP)/src
 
 #
 CFLAGS += $(addprefix -I,$(INC))
-LDFLAGS += $(CFLAGS) -Wl,-T,$(TOP)/$(LD_FILE) -Wl,[email protected] -Wl,-cref -Wl,-gc-sections -specs=nosys.specs -specs=nano.specs
+ifeq ($(BOARD), msp_exp430f5529lp)
+  LDFLAGS += $(CFLAGS) -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,[email protected] -Wl,-cref -Wl,-gc-sections
+else
+  LDFLAGS += $(CFLAGS) -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,[email protected] -Wl,-cref -Wl,-gc-sections -specs=nosys.specs -specs=nano.specs
+endif
 ASFLAGS += $(CFLAGS)
 
-# Assembly files can be name with upper case .S, convert it to .s 
+# Assembly files can be name with upper case .S, convert it to .s
 SRC_S := $(SRC_S:.S=.s)
 
 # Due to GCC LTO bug https://bugs.launchpad.net/gcc-arm-embedded/+bug/1747966
@@ -66,8 +70,8 @@ $(BUILD)/$(BOARD)-firmware.elf: $(OBJ)
 $(BUILD)/$(BOARD)-firmware.bin: $(BUILD)/$(BOARD)-firmware.elf
 	@echo CREATE $@
 	@$(OBJCOPY) -O binary $^ $@
-	
-$(BUILD)/$(BOARD)-firmware.hex: $(BUILD)/$(BOARD)-firmware.elf	
+
+$(BUILD)/$(BOARD)-firmware.hex: $(BUILD)/$(BOARD)-firmware.elf
 	@echo CREATE $@
 	@$(OBJCOPY) -O ihex $^ $@
 
@@ -114,7 +118,7 @@ clean:
 # Flash binary using Jlink
 ifeq ($(OS),Windows_NT)
   JLINKEXE = JLink.exe
-else 
+else
   JLINKEXE = JLinkExe
 endif