From be4131d2772bf2e6fb1aeb1336ad65b549e04eb7 Mon Sep 17 00:00:00 2001
From: Richard Weickelt <r-weickelt@ti.com>
Date: Tue, 6 Feb 2018 12:30:10 +0100
Subject: [PATCH] Add necessary SDK libraries and include paths

---
 arch/cpu/simplelink/Makefile.cc26x2_cc13x2 | 11 +++++++----
 arch/cpu/simplelink/Makefile.simplelink    |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/arch/cpu/simplelink/Makefile.cc26x2_cc13x2 b/arch/cpu/simplelink/Makefile.cc26x2_cc13x2
index 3fe18edf2..a0a91679f 100644
--- a/arch/cpu/simplelink/Makefile.cc26x2_cc13x2
+++ b/arch/cpu/simplelink/Makefile.cc26x2_cc13x2
@@ -1,14 +1,17 @@
 
-SDK_DRIVERLIB_BIN := $(SDK_DRIVERLIB)/bin/gcc
-
-ifeq "$(SIMPLELINK_DEVICE)" "cc13x2" 
+ifeq "$(SIMPLELINK_DEVICE)" "cc13x2"
 CFLAGS += -DDeviceFamily_CC13X2
 else
 CFLAGS += -DDeviceFamily_CC26X2
 endif
 
 CFLAGS += -I$(CPU_ABS_PATH)/cc26x2_cc13x2
+CFLAGS += -I$(SDK_KERNEL)
+
+TARGET_LIBFILES += $(SDK_DRIVERLIB)/bin/gcc/driverlib.lib
+TARGET_LIBFILES += $(SDK_DRIVERS)/lib/drivers_cc13x2.am4fg
+TARGET_LIBFILES += $(SDK_DRIVERS)/lib/rf_multiMode_cc13x2.am4fg
+TARGET_LIBFILES += $(SDK_KERNEL)/lib/nortos_cc13x2.am4fg
 
-TARGET_LIBFILES += $(SDK_DRIVERLIB_BIN)/driverlib.lib
 
 include $(CONTIKI)/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
diff --git a/arch/cpu/simplelink/Makefile.simplelink b/arch/cpu/simplelink/Makefile.simplelink
index 4904ba446..e4f959543 100644
--- a/arch/cpu/simplelink/Makefile.simplelink
+++ b/arch/cpu/simplelink/Makefile.simplelink
@@ -7,6 +7,8 @@ SDK_DEVICES := $(SDK_SOURCE)/ti/devices
 SDK_DEVICE := $(shell ls $(SDK_DEVICES) | grep $(SIMPLELINK_DEVICE))
 SDK_DEVICE_SOURCE := $(SDK_SOURCE)/ti/devices/$(SDK_DEVICE)
 SDK_DRIVERLIB := $(SDK_DEVICE_SOURCE)/driverlib
+SDK_DRIVERS := $(SDK_SOURCE)/ti/drivers
+SDK_KERNEL := $(SIMPLELINK_SDK)/kernel/nortos/
 SDK_BOARDS := $(SDK_SOURCE)/ti/boards
 SDK_STARTUP := $(SDK_DEVICE_SOURCE)/startup_files
 SDK_STARTUP_SRCS = ccfg.c startup_gcc.c
@@ -15,10 +17,12 @@ EXTERNALDIRS += $(SDK_STARTUP)
 
 ### MODULES will add some of these to the include path, but we need to add
 ### them earlier to prevent filename clashes with Contiki core files
-CFLAGS += -I$(CPU_ABS_PATH) 
+CFLAGS += -I$(CPU_ABS_PATH)
 CFLAGS += -I$(SDK_SOURCE)
 CFLAGS += -I$(SDK_DEVICE_SOURCE)
 CFLAGS += -I$(SDK_DEVICE_SOURCE)/inc
+CFLAGS += -I$(SDK_KERNEL)
+CFLAGS += -I$(SDK_KERNEL)/posix
 
 LDSCRIPT = $(SDK_BOARDS)/$(SIMPLELINK_BOARD)/$(SIMPLELINK_BOARD)_NoRTOS.lds