Merge branch 'develop' into bugfix/build/include-platform-twice

Author: simonduq

Makefile.gcc

@@ -0,0 +1,27 @@
+# -*- makefile -*-
+#
+# GCC specific definitions and actions
+#
+
+GCC_MAJOR_VERSION := $(shell $(CC) -v 2>&1 | grep "gcc version" | cut -b 13)
+GCC_MINOR_VERSION := $(shell $(CC) -v 2>&1 | grep "gcc version" | cut -b 15)
+
+# Warn if using version 6.3.x of arm-none-eabi-gcc
+ifeq ("$(CC)","arm-none-eabi-gcc")
+  ifeq (6,$(GCC_MAJOR_VERSION))
+    ifeq (3,$(GCC_MINOR_VERSION))
+      $(warning Warning: you're using a version of $(CC) that may create broken Contiki-NG executables.)
+      $(warning We recommend to upgrade or downgrade your toolchain.)
+    endif
+  endif
+endif
+
+# Warn if using 4.6.x or older msp430-gcc
+ifeq ("$(CC)","msp430-gcc")
+  ifeq ($(shell test $(GCC_MAJOR_VERSION) -lt 5; echo $$?),0)
+    ifeq ($(shell test $(GCC_MINOR_VERSION) -lt 7; echo $$?),0)
+      $(warning Warning: you're using an old version of $(CC).)
+      $(warning Upgrade to 4.7.x is recommended for extended memory support and bugfixes.)
+    endif
+  endif
+endif

Makefile.include

@@ -469,6 +469,9 @@ ifeq ($(findstring $(TARGET),native cooja),)
   include $(CONTIKI)/Makefile.embedded
 endif
 
+### Include Makefile.gcc for GCC specific definitions and actions
+include $(CONTIKI)/Makefile.gcc
+
 # Don't treat $(BUILD_DIR_BOARD)/%.$(TARGET) and $(TARGET) as intermediate
 # files because for many platforms they are in fact the primary target.
 .PRECIOUS: $(BUILD_DIR_BOARD)/%.$(TARGET) %.$(TARGET)

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

@@ -97,4 +97,4 @@ else
 endif
 
 ### For the login etc targets
-BAUDRATE = 115200
+BAUDRATE ?= 115200

arch/platform/zoul/Makefile.zoul

@@ -24,7 +24,7 @@ CFLAGS += -DDATE="\"`date +"%02u %02d %02m %02y %02H %02M %02S"`\""
 
 ### Configure the build for the board and pull in board-specific sources
 CONTIKI_TARGET_DIRS += . dev
-CONTIKI_TARGET_DIRS += . $(BOARD)
+CONTIKI_TARGET_DIRS += $(BOARD)
 PLATFORM_ROOT_DIR = $(ARCH_PATH)/platform/$(TARGET)
 
 ### Include the board dir if one exists
@@ -86,5 +86,5 @@ zoul-motes:
 	@echo $(MOTES)
 
 ### For the login etc targets
-BAUDRATE = 115200
+BAUDRATE ?= 115200
 PORT = $(USBDEVPREFIX)$(firstword $(MOTES))

examples/sensniff/Makefile

@@ -10,9 +10,11 @@ include $(CONTIKI)/Makefile.identify-target
 
 all: $(CONTIKI_PROJECT)
 
+# Disable all networking layer 3 upwards 
+MAKE_NET=MAKE_NET_NULLNET
+
 # use a custom MAC driver: sensniff_mac_driver
 MAKE_MAC = MAKE_MAC_OTHER
-include $(CONTIKI)/Makefile.include
 
 PYTHON ?= python
 SENSNIFF = $(CONTIKI)/tools/sensniff/sensniff.py
@@ -27,6 +29,8 @@ ifneq ($(PORT),)
   SENSNIFF_FLAGS += -d $(PORT)
 endif
 
+include $(CONTIKI)/Makefile.include
+
 sniff:
 ifeq ($(wildcard $(SENSNIFF)), )
 	$(error Could not find the sensniff script. Did you run 'git submodule update --init' ?")

examples/sensniff/sensniff-mac.c

@@ -69,12 +69,19 @@ init(void)
   on();
 }
 /*---------------------------------------------------------------------------*/
+static int
+max_payload(void)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
 const struct mac_driver sensniff_mac_driver = {
   "sensniff-rdc",
   init,
   send,
   input,
   on,
-  off
+  off,
+  max_payload,
 };
 /*---------------------------------------------------------------------------*/

tests/07-simulation-base/15-cooja-multicast-11-hops-rollt-tm.csc

@@ -24,7 +24,8 @@
       <identifier>mtype612</identifier>
       <description>Root/sender</description>
       <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
+      <commands>make TARGET=cooja clean
+make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>

tests/07-simulation-base/16-cooja-multicast-11-hops-smrf.csc

@@ -24,7 +24,8 @@
       <identifier>mtype612</identifier>
       <description>Root/sender</description>
       <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
+      <commands>make TARGET=cooja clean
+make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>

tests/07-simulation-base/17-cooja-multicast-11-hops-esmrf.csc

@@ -24,7 +24,8 @@
       <identifier>mtype612</identifier>
       <description>Root/sender</description>
       <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
+      <commands>make TARGET=cooja clean
+make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>

tests/07-simulation-base/18-cooja-multicast-31-hops.csc

@@ -24,7 +24,8 @@
       <identifier>mtype816</identifier>
       <description>Root/sender</description>
       <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make -j root.cooja TARGET=cooja</commands>
+      <commands>make TARGET=cooja clean
+make -j root.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>

tests/08-native-runs/02-mqtt-client.sh

@@ -28,7 +28,7 @@ sleep 2
 
 # Starting Contiki-NG native node
 echo "Starting native node"
-make -C $CODE_DIR TARGET=native \
+make -C $CODE_DIR -B TARGET=native \
   DEFINES=MQTT_CLIENT_CONF_ORG_ID=\\\"travis-test\\\",MQTT_CLIENT_CONF_LOG_LEVEL=LOG_LEVEL_DBG \
   > make.log 2> make.err
 sudo $CODE_DIR/$CODE.native > $CLIENT_LOG 2> $CLIENT_ERR &

tests/13-ieee802154/code-6tisch/common.c

@@ -38,6 +38,8 @@
 #include "lib/simEnvChange.h"
 #include "sys/cooja_mt.h"
 
+#define TEST_MAC_MAX_PAYLOAD_LEN 100
+
 static uint8_t send_is_called;
 
 void
@@ -73,11 +75,36 @@ send(mac_callback_t sent_callback, void *ptr)
   send_is_called = 1;
 }
 
+static void
+input(void)
+{
+  /* do nothing */
+}
+
+static int
+on(void)
+{
+  return 1; /* always on */
+}
+
+static int
+off(void)
+{
+  return 0; /* never be turned off */
+}
+
+static int
+max_payload(void)
+{
+  return TEST_MAC_MAX_PAYLOAD_LEN;
+}
+
 const struct mac_driver test_mac_driver = {
   "Test MAC",
   init,
   send,
-  NULL,
-  NULL,
-  NULL
+  input,
+  on,
+  off,
+  max_payload,
 };

tests/14-rpl-lite/02-rpl-root-reboot-2.csc

@@ -25,7 +25,8 @@
       <identifier>mtype34</identifier>
       <description>mote</description>
       <source>[CONTIKI_DIR]/examples/libs/shell/example.c</source>
-      <commands>make example.cooja TARGET=cooja MAKE_ROUTING=MAKE_ROUTING_RPL_LITE -j</commands>
+      <commands>make TARGET=cooja clean
+make example.cooja TARGET=cooja MAKE_ROUTING=MAKE_ROUTING_RPL_LITE -j</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>

tests/15-rpl-classic/02-rpl-root-reboot-2.csc

@@ -25,7 +25,8 @@
       <identifier>mtype512</identifier>
       <description>mote</description>
       <source>[CONTIKI_DIR]/examples/libs/shell/example.c</source>
-      <commands>make example.cooja TARGET=cooja MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC -j</commands>
+      <commands>make TARGET=cooja clean
+make example.cooja TARGET=cooja MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC -j</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>

tests/17-tun-rpl-br/test-native-border-router.sh

@@ -30,7 +30,7 @@ sleep 20
 
 # Connect to the simulation
 echo "Starting native border-router"
-nohup make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=native >> $BASENAME.nbr.log 2>&1 &
+nohup make -C $CONTIKI/examples/rpl-border-router/ -B connect-router-cooja TARGET=native >> $BASENAME.nbr.log 2>&1 &
 MPID=$!
 printf "Waiting for network formation (%d seconds)\n" "$WAIT_TIME"
 sleep $WAIT_TIME