diff --git a/arch/cpu/simplelink/Makefile.simplelink b/arch/cpu/simplelink/Makefile.simplelink
index 3e83c74b3..8b2cba4ee 100644
--- a/arch/cpu/simplelink/Makefile.simplelink
+++ b/arch/cpu/simplelink/Makefile.simplelink
@@ -35,6 +35,10 @@ ifneq ($(SIMPLELINK_BOARD),CUSTOM)
   LDSCRIPT = $(SDK_BOARDS)/$(SIMPLELINK_BOARD)/$(SIMPLELINK_BOARD)_NoRTOS.lds
   CFLAGS += -I$(SDK_BOARDS)/$(SIMPLELINK_BOARD)
   CONTIKI_SOURCEFILES += $(SIMPLELINK_BOARD).c
+else
+  ifndef $(LDSCRIPT)
+    $(error You must speficy a custom linker script in LDSCRIPT.)
+  endif
 endif
 
 
@@ -75,7 +79,7 @@ $(OBJECTDIR)/ccfg.o: ccfg.c FORCE | $(OBJECTDIR)
 	$(TRACE_CC)
 	$(Q)$(CC) $(CFLAGS) -include "ccfg-conf.h" -c $< -o $@
 
-$(OBJECTDIR)/$(SIMPLELINK_BOARD).o: $(SDK_SOURCE)/ti/boards/$(SIMPLELINK_BOARD)/$(SIMPLELINK_BOARD).c
+$(OBJECTDIR)/$(SIMPLELINK_BOARD).o: $(SDK_BOARDS)/$(SIMPLELINK_BOARD)/$(SIMPLELINK_BOARD).c
 	$(TRACE_CC)
 	$(Q)$(CC) $(CFLAGS) -c $< -o $@
 
diff --git a/arch/platform/simplelink/Makefile.simplelink b/arch/platform/simplelink/Makefile.simplelink
index 25f6c2471..bed4c64a5 100644
--- a/arch/platform/simplelink/Makefile.simplelink
+++ b/arch/platform/simplelink/Makefile.simplelink
@@ -8,7 +8,7 @@ ifndef SIMPLELINK_SDK
   $(error SIMPLELINK_SDK not defined! You must specify where the SimpleLink SDK resides!)
 endif
 
-AVAILABLE_BOARDS := $(shell ls -d $(SIMPLELINK_SDK)/source/ti/boards)
+AVAILABLE_BOARDS := $(shell ls $(SIMPLELINK_SDK)/source/ti/boards/)
 AVAILABLE_BOARDS += CUSTOM # Allows an own board file in the application project
 
 ifndef SIMPLELINK_BOARD