giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added the Core SDK submodule

This commit is contained in:
Edvard Pettersen 2018-07-24 17:46:42 +02:00
parent 66005c9232
commit a199809298
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -22,3 +22,6 @@
[submodule "tools/motelist"]
path = tools/motelist
url = https://github.com/contiki-ng/motelist
[submodule "arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx"]
path = arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
url = https://github.com/contiki-ng/coresdk_cc13xx_cc26xx.git

27
arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx
View File

@ -1,13 +1,34 @@
################################################################################
# CC13x2/CC26x2 CPU makefile
# Core SDK is placed as a submodule under the arch/cpu/cc13xx-cc26xx/lib.
# Do a sanity check that Core SDK submodule has been initialized.
# Note that Core SDK can be overriden with a user-specified SimpleLink SDK.
# As long as the SimpleLink SDK matches the device in use and is of a reasonable
# newer version, then it should be no different than using Core SDK.
ifeq ($(CORE_SDK),)
CORE_SDK := $(CONTIKI_CPU)/lib/coresdk_cc13xx_cc26xx
CORE_SDK_INIT := $(shell [ -f $(CORE_SDK)/.git ]; echo $$?)
ifeq ($(CORE_SDK_INIT),1)
$(error The Core SDK submodule is not available. Please run 'git submodule update --init --recursive')
endif
else
# Core SDK was overriden. Do a sanity check the path exists.
CORE_SDK_VALID := $(shell [ -d $(CORE_SDK) ]; echo $$?)
ifeq ($(CORE_SDK_VALID),1)
$(error Supplied CORE_SDK is not a valid path.)
endif
endif
# Clean up the path.
CORE_SDK := ${realpath $(CORE_SDK)}
# ccfg.c comes from the device-specific startp_files folder,
# and startup_cc13xx_cc26xx_gcc.c comes from NoRTOS startup folder
CPU_START_SOURCEFILES += ccfg.c startup_cc13xx_cc26xx_gcc.c
################################################################################
# Device Family
DEVICE_FAMILY_H := $(SIMPLELINK_SDK)/source/ti/devices/DeviceFamily.h
DEVICE_FAMILY_H := $(CORE_SDK)/source/ti/devices/DeviceFamily.h
# The define of the Device Family ID is on the format of either
# #define DeviceFamily_ID_<device> <number>
@ -54,8 +75,8 @@ SDK_DEVICE_DIR := $(shell echo "DeviceFamily_constructPath(dummy)" \
################################################################################
# Simplelink SDK paths
SDK_KERNEL := $(SIMPLELINK_SDK)/kernel/nortos
SDK_SOURCE := $(SIMPLELINK_SDK)/source
SDK_KERNEL := $(CORE_SDK)/kernel/nortos
SDK_SOURCE := $(CORE_SDK)/source
SDK_BOARDS := $(SDK_SOURCE)/ti/boards
SDK_DRIVERS := $(SDK_SOURCE)/ti/drivers
SDK_DEVICE := $(SDK_SOURCE)/$(SDK_DEVICE_DIR)

1
arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx Submodule

@ -0,0 +1 @@
Subproject commit b83faf3be2cb7468dc836a6fbd9d804638263252

16
arch/platform/simplelink/Makefile.simplelink
View File

@ -5,25 +5,15 @@
### Sanity check of expected symbols
ifndef CONTIKI
$(error 'CONTIKI' not defined! You must specify where CONTIKI resides!)
$(error 'CONTIKI' not defined! You must specify where CONTIKI resides!)
endif
ifndef FAMILY
$(error 'FAMILY' not defined! You must specify which Simplelink family you are using!)
$(error 'FAMILY' not defined! You must specify which Simplelink family you are using!)
endif
ifndef BOARD
$(error 'BOARD' not defined! You must specify which board you are using!)
endif
ifndef SIMPLELINK_SDK
$(error 'SIMPLELINK_SDK' not defined! You must specify where the installed SimpleLink SDK resides!)
endif
SIMPLELINK_SDK_EXISTS := $(shell [ -d "$(SIMPLELINK_SDK)" ]; echo $$?)
ifneq ($(SIMPLELINK_SDK_EXISTS),0)
$(error Simplelink SDK path 'SIMPLELINK_SDK' does not exist)
$(error 'BOARD' not defined! You must specify which board you are using!)
endif
################################################################################