Merge branch 'develop' into contrib/fix-viewconf

This commit is contained in:
Simon Duquennoy 2018-02-27 20:45:42 +01:00 committed by GitHub
commit 508a32876d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,7 +6,7 @@ endif
### Board and BSP selection ### Board and BSP selection
BOARD ?= srf06/cc26xx BOARD ?= srf06/cc26xx
BOARDS = srf06/cc26xx srf06/cc13xx launchpad/cc26xx launchpad/cc13xx sensortag/cc26xx sensortag/cc13xx BOARDS = srf06/cc26xx srf06/cc13xx launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
CONTIKI_TARGET_DIRS += . CONTIKI_TARGET_DIRS += .