Merge branch 'develop' into tsch-resync-target
This commit is contained in:
Simon Duquennoy
GitHub
commit
4dc465c16f
4
.gitignore
vendored
4
.gitignore
vendored
@ -36,7 +36,7 @@ COOJA.testlog
|
||||
*.simplelink
|
||||
*.sky
|
||||
*.firmware
|
||||
*.srf06-cc26xx
|
||||
*.cc26x0-cc13x0
|
||||
*.zoul
|
||||
|
||||
# do not ignore platform makefiles
|
||||
@ -47,7 +47,7 @@ COOJA.testlog
|
||||
!Makefile.nrf52dk
|
||||
!Makefile.openmote-cc2538
|
||||
!Makefile.sky
|
||||
!Makefile.srf06-cc26xx
|
||||
!Makefile.cc26x0-cc13x0
|
||||
!Makefile.zoul
|
||||
|
||||
# other nRF52 build artifacts
|
||||
|
||||
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -2,10 +2,10 @@
|
||||
path = tools/cc2538-bsl
|
||||
url = https://github.com/JelmerT/cc2538-bsl.git
|
||||
[submodule "arch/cpu/cc26xx-cc13xx/lib/cc26xxware"]
|
||||
path = arch/cpu/cc26xx-cc13xx/lib/cc26xxware
|
||||
path = arch/cpu/cc26x0-cc13x0/lib/cc26xxware
|
||||
url = https://github.com/contiki-ng/cc26xxware.git
|
||||
[submodule "arch/cpu/cc26xx-cc13xx/lib/cc13xxware"]
|
||||
path = arch/cpu/cc26xx-cc13xx/lib/cc13xxware
|
||||
path = arch/cpu/cc26x0-cc13x0/lib/cc13xxware
|
||||
url = https://github.com/contiki-ng/cc13xxware.git
|
||||
[submodule "tools/sensniff"]
|
||||
path = tools/sensniff
|
||||
@ -26,5 +26,5 @@
|
||||
path = arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
|
||||
url = https://github.com/contiki-ng/coresdk_cc13xx_cc26xx.git
|
||||
[submodule "arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk"]
|
||||
path = arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk
|
||||
path = arch/cpu/cc26x0-cc13x0/lib/cc2640r2-sdk
|
||||
url = https://github.com/contiki-ng/cc2640r2-sdk.git
|
||||
|
||||
@ -4,4 +4,4 @@ CONTIKI_CPU_SOURCEFILES += smartrf-settings.c prop-mode.c prop-mode-tx-power.c c
|
||||
|
||||
CFLAGS += -DCPU_FAMILY_CC13X0=1 -DCPU_FAMILY_CC13XX=1
|
||||
|
||||
include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
|
||||
include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0
|
||||
@ -2,4 +2,4 @@ TI_XXWARE_PATH = lib/cc26xxware
|
||||
|
||||
CFLAGS += -DCPU_FAMILY_CC26X0=1 -DCPU_FAMILY_CC26XX=1
|
||||
|
||||
include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
|
||||
include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0
|
||||
@ -1,4 +1,4 @@
|
||||
CPU_ABS_PATH = arch/cpu/cc26xx-cc13xx
|
||||
CPU_ABS_PATH = arch/cpu/cc26x0-cc13x0
|
||||
TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH)
|
||||
|
||||
ifeq (,$(wildcard $(TI_XXWARE)/*))
|
||||
@ -2,4 +2,4 @@ TI_XXWARE_PATH = lib/cc2640r2-sdk
|
||||
|
||||
CFLAGS += -DCPU_FAMILY_CC26X0R2=1 -DCPU_FAMILY_CC26XXR2=1
|
||||
|
||||
include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
|
||||
include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0
|
||||
@ -36,7 +36,7 @@
|
||||
* @{
|
||||
*
|
||||
* \file
|
||||
* CCxxware-specific configuration for the cc26xx-cc13xx CPU family
|
||||
* CCxxware-specific configuration for the cc26x0-cc13x0 CPU family
|
||||
*/
|
||||
#ifndef CCXXWARE_CONF_H_
|
||||
#define CCXXWARE_CONF_H_
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
CC13x2_CC26x2_PRE_RTM ?= 1
|
||||
|
||||
# Core SDK is placed as a submodule under arch/cpu/cc13xx-cc26xx/lib.
|
||||
# Core SDK is placed as a submodule under arch/cpu/simplelink-cc13xx-cc26xx/lib.
|
||||
# Do a sanity check that Core SDK submodule has been initialized.
|
||||
ifndef CORE_SDK
|
||||
CORE_SDK := $(CONTIKI_CPU)/lib/coresdk_cc13xx_cc26xx
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# srf06-cc26xx platform makefile
|
||||
# cc26x0-cc13x0 platform makefile
|
||||
|
||||
ifndef CONTIKI
|
||||
$(error CONTIKI not defined! You must specify where CONTIKI resides!)
|
||||
endif
|
||||
|
||||
### Board and BSP selection
|
||||
BOARD ?= srf06/cc26xx
|
||||
BOARDS = srf06/cc26xx srf06/cc13xx launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
|
||||
BOARD ?= srf06/cc26x0
|
||||
BOARDS = srf06/cc26x0 srf06/cc13x0 launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
|
||||
|
||||
CONTIKI_TARGET_DIRS += .
|
||||
|
||||
@ -25,5 +25,5 @@ SMALL ?= 0
|
||||
### Define the CPU directory and pull in the correct CPU makefile. This will
|
||||
### be defined by one of the makefiles included above and it can be either
|
||||
### Makefile.cc26xx or Makefile.cc13xx
|
||||
CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26xx-cc13xx
|
||||
CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26x0-cc13x0
|
||||
include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
|
||||
@ -32,7 +32,7 @@
|
||||
* @{
|
||||
*
|
||||
* \file
|
||||
* Configuration for the srf06-cc26xx platform
|
||||
* Configuration for the cc26x0-cc13x0 platform
|
||||
*/
|
||||
#ifndef CONTIKI_CONF_H
|
||||
#define CONTIKI_CONF_H
|
||||
@ -1,5 +1,5 @@
|
||||
### Will allow the inclusion of the correct CPU makefile
|
||||
CPU_FAMILY = cc13xx
|
||||
CPU_FAMILY = cc13x0
|
||||
|
||||
### Add to the source dirs
|
||||
CONTIKI_TARGET_DIRS += launchpad/cc1310
|
||||
@ -1,5 +1,5 @@
|
||||
### Will allow the inclusion of the correct CPU makefile
|
||||
CPU_FAMILY = cc13xx
|
||||
CPU_FAMILY = cc13x0
|
||||
|
||||
### Add to the source dirs
|
||||
CONTIKI_TARGET_DIRS += launchpad/cc1350
|
||||
@ -1,5 +1,5 @@
|
||||
### Will allow the inclusion of the correct CPU makefile
|
||||
CPU_FAMILY = cc26xx
|
||||
CPU_FAMILY = cc26x0
|
||||
|
||||
### Add to the source dirs
|
||||
CONTIKI_TARGET_DIRS += launchpad/cc2650
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user