diff --git a/arch/cpu/arm/cortex-m/cm3/Makefile.cm3 b/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
index 29adac8e8..1c9ffc04a 100644
--- a/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
+++ b/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
@@ -24,7 +24,7 @@ CUSTOM_RULE_LINK = 1
 
 .SECONDEXPANSION:
 
-%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES)
+%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(TARGET_LIBS)
 	$(TRACE_LD)
 	$(Q)$(LD) $(LDFLAGS) ${filter %.o %.a,$^} $(TARGET_LIBFLAGS) -o $@
 
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/board-conf.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/board-conf.h
index c7461f92a..d949062bc 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/board-conf.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/board-conf.h
@@ -94,6 +94,7 @@
  * Those values are not meant to be modified by the user
  * @{
  */
+#if TI_SPI_CONF_SPI0_ENABLE
 #define EXT_FLASH_SPI_CONTROLLER      Board_SPI0
 
 #define EXT_FLASH_SPI_PIN_SCK         GPIO_HAL_PIN_UNKNOWN
@@ -106,6 +107,7 @@
 
 #define EXT_FLASH_PROGRAM_PAGE_SIZE   256
 #define EXT_FLASH_ERASE_SECTOR_SIZE   4096
+#endif /* TI_SPI_CONF_SPI0_ENABLE */
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* BOARD_CONF_H_ */
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/board-conf.h b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/board-conf.h
index 85dfbb6bf..fedc82f17 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/board-conf.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/board-conf.h
@@ -89,6 +89,7 @@
  * Those values are not meant to be modified by the user
  * @{
  */
+#if TI_SPI_CONF_SPI0_ENABLE
 #define EXT_FLASH_SPI_CONTROLLER      Board_SPI0
 
 #define EXT_FLASH_SPI_PIN_SCK         GPIO_HAL_PIN_UNKNOWN
@@ -101,6 +102,7 @@
 
 #define EXT_FLASH_PROGRAM_PAGE_SIZE   256
 #define EXT_FLASH_ERASE_SECTOR_SIZE   4096
+#endif /* TI_SPI_CONF_SPI0_ENABLE */
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* BOARD_CONF_H_ */
diff --git a/examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.simplelink b/examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.simplelink
deleted file mode 100644
index 32213ecdd..000000000
Binary files a/examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.simplelink and /dev/null differ