Merge branch 'develop' into contrib/uip-cleanup

.gitignore

@@ -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

.gitmodules

@@ -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

.travis.yml

@@ -30,8 +30,10 @@ before_install:
         docker push $DOCKER_IMG;
       fi
     fi
-  # Build Cooja
-  - ant -q -f $CNG_HOST_PATH/tools/cooja/build.xml jar
+  # Build Cooja conditionally
+  - if [ ${BUILD_COOJA:-false} = true ] ; then
+      ant -q -f $CNG_HOST_PATH/tools/cooja/build.xml jar ;
+    fi
   # Set permissions for Docker mount
   - sudo chgrp -hR 1000 $CNG_HOST_PATH
 
@@ -55,14 +57,15 @@ env:
     - TEST_NAME='compile-base'
     - TEST_NAME='compile-arm-ports-01'
     - TEST_NAME='compile-arm-ports-02'
-    - TEST_NAME='rpl-lite'
-    - TEST_NAME='rpl-classic'
-    - TEST_NAME='tun-rpl-br'
+    - TEST_NAME='rpl-lite' BUILD_COOJA=true
+    - TEST_NAME='rpl-classic' BUILD_COOJA=true
+    - TEST_NAME='tun-rpl-br' BUILD_COOJA=true
     - TEST_NAME='coap-lwm2m'
-    - TEST_NAME='simulation-base'
-    - TEST_NAME='ieee802154'
+    - TEST_NAME='simulation-base' BUILD_COOJA=true
+    - TEST_NAME='ieee802154' BUILD_COOJA=true
     - TEST_NAME='compile-nxp-ports'
     - TEST_NAME='documentation'
     - TEST_NAME='compile-tools'
     - TEST_NAME='native-runs'
-    - TEST_NAME='ipv6'
+    - TEST_NAME='ipv6' BUILD_COOJA=true
+    - TEST_NAME='ipv6-nbr' BUILD_COOJA=true

Makefile.embedded

@@ -3,6 +3,9 @@
 # Future extensions to the build system that are of a similar nature (for
 # embedded devices only), can be achieved by extending this Makefile here.
 
+###
+### Targets using the tools/serial-io
+###
 RLWRAPGOALS = login serialdump serialview
 
 .PHONY: $(RLWRAPGOALS)
@@ -31,3 +34,14 @@ serialview: $(SERIAL_DUMP_BIN)
 
 login: $(SERIAL_DUMP_BIN)
 	$(SERIALDUMP) -b$(BAUDRATE) $(PORT)
+
+###
+### Targets using tools/motelist
+###
+CONTIKI_NG_MOTELIST_DIR = $(TOOLS_DIR)/motelist
+CONTIKI_NG_MOTELIST = python $(CONTIKI_NG_MOTELIST_DIR)/motelist.py
+
+.PHONY: motelist-all
+
+motelist-all:
+	$(CONTIKI_NG_MOTELIST)

Makefile.help

@@ -0,0 +1,29 @@
+usage:
+	@echo "Usage:"
+	@echo "    make [TARGET=(TARGET)] [BOARD=(BOARD)] [DEFINES=(DEFINES)] [PORT=(PORT)] [target]"
+	@echo ""
+	@echo "Typical usage:"
+	@echo "    make [TARGET=(TARGET)] [BOARD=(BOARD)] [all]"
+	@echo ""
+	@echo "    Will build Contiki-NG firmware(s) from the current example dir"
+	@echo "    for platform TARGET, board BOARD."
+	@echo ""
+	@echo "Miscellaneous targets:"
+	@echo "    targets         Prints list of supported platforms"
+	@echo "    boards          Prints a list of supported boards for TARGET"
+	@echo "    savetarget      Saves TARGET and BOARD for future invocations of make"
+	@echo "    savedefines     Saves DEFINES for future invocations of make"
+	@echo "    clean           Removes all compiled files for TARGET"
+	@echo "    distclean       Removes all compiled files for all TARGETs"
+	@echo "    viewconf        Prints Contiki-NG build configuration for TARGET"
+	@echo "    %.flashprof     Shows a Flash/ROM profile of a given firmware (e.g. hello-world.flashprof)"
+	@echo "    %.ramprof       Shows a RAM profile of a given firmware (e.g. hello-world.ramprof)"
+	@echo "    %.o             Produces an object file from a given source file (e.g. hello-world.o)"
+	@echo "    %.e             Produces the pre-processed version of a given source file (e.g. hello-world.e)"
+	@echo "    %.s             Produces an assembly file from a given source file (e.g. hello-world.s)"
+	@echo "    login           View the serial output of the device connected to PORT"
+	@echo "    serialview      Same as login, but prepend serial output with a unix timestamp"
+	@echo "    serialdump      same as serialview, but also save the output to a file"
+	@echo "    motelist-all    Prints a list of connected devices"
+
+help: usage

Makefile.include

@@ -395,34 +395,7 @@ endif
 %.flashprof: %.$(TARGET)
 	$(NM) -S -td --size-sort $< | grep -i " [t] " | cut -d' ' -f2,4
 
-usage:
-	@echo "Usage:"
-	@echo "    make [TARGET=(TARGET)] [BOARD=(BOARD)] [DEFINES=(DEFINES)] [PORT=(PORT)] [target]"
-	@echo ""
-	@echo "Typical usage:"
-	@echo "    make [TARGET=(TARGET)] [BOARD=(BOARD)] [all]"
-	@echo ""
-	@echo "    Will build Contiki-NG firmware(s) from the current example dir"
-	@echo "    for platform TARGET, board BOARD."
-	@echo ""
-	@echo "Miscellaneous targets:"
-	@echo "    targets         Prints list of supported platforms"
-	@echo "    boards          Prints a list of supported boards for TARGET"
-	@echo "    savetarget      Saves TARGET and BOARD for future invocations of make"
-	@echo "    savedefines     Saves DEFINES for future invocations of make"
-	@echo "    clean           Removes all compiled files for TARGET"
-	@echo "    distclean       Removes all compiled files for all TARGETs"
-	@echo "    viewconf        Prints Contiki-NG build configuration for TARGET"
-	@echo "    %.flashprof     Shows a Flash/ROM profile of a given firmware (e.g. hello-world.flashprof)"
-	@echo "    %.ramprof       Shows a RAM profile of a given firmware (e.g. hello-world.ramprof)"
-	@echo "    %.o             Produces an object file from a given source file (e.g. hello-world.o)"
-	@echo "    %.e             Produces the pre-processed version of a given source file (e.g. hello-world.e)"
-	@echo "    %.s             Produces an assembly file from a given source file (e.g. hello-world.s)"
-	@echo "    login           View the serial output of the device connected to PORT"
-	@echo "    serialview      Same as login, but prepend serial output with a unix timestamp"
-	@echo "    serialdump      same as serialview, but also save the output to a file"
-
-help: usage
+include $(CONTIKI)/Makefile.help
 
 targets:
 	@ls $(CONTIKI)/arch/platform $(TARGETDIRS)

arch/cpu/cc26x0-cc13x0/Makefile.cc13x0

@@ -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

arch/cpu/cc26x0-cc13x0/Makefile.cc26x0

@@ -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

arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0

@@ -1,8 +1,8 @@
-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)))
-    $(warning $(TI_XXWARE) does not exist.)
+ifeq (,$(wildcard $(TI_XXWARE)/*))
+    $(warning $(TI_XXWARE) does not exist or is empty.)
     $(warning Did you run 'git submodule update --init' ?)
     $(error "")
 endif

arch/cpu/cc26x0-cc13x0/Makefile.cc26x0r2f

@@ -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

arch/cpu/cc26x0-cc13x0/ccxxware-conf.h

@@ -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_

arch/cpu/cc26x0-cc13x0/rf-core/rf-core.c

@@ -512,9 +512,13 @@ rf_core_setup_interrupts(void)
 void
 rf_core_cmd_done_en(bool fg)
 {
-  uint32_t irq = fg ? IRQ_LAST_FG_COMMAND_DONE : IRQ_LAST_COMMAND_DONE;
+  uint32_t irq = 0;
   const uint32_t enabled_irqs = rf_core_poll_mode ? ENABLED_IRQS_POLL_MODE : ENABLED_IRQS;
 
+  if(!rf_core_poll_mode) {
+    irq = fg ? IRQ_LAST_FG_COMMAND_DONE : IRQ_LAST_COMMAND_DONE;
+  }
+
   HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIFG) = enabled_irqs;
   HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = enabled_irqs | irq;
 }

arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx

@@ -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

arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0

@@ -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)

arch/platform/cc26x0-cc13x0/contiki-conf.h

@@ -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

arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.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/cc1310

arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350

@@ -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

arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650

@@ -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