OlegHahm

diff --git a/content/Makefile b/content/Makefile
index 5ee6e47..b240241 100644
--- a/content/Makefile
+++ b/content/Makefile
@@ -5,7 +5,7 @@ BOARD ?= native
 BOARD_WHITELIST := fox iotlab-m3 msba2 mulle native pba-d-01-kw2x samr21-xpro
 
 #RIOTBASE ?= $(CURDIR)/../../riot
-RIOTBASE ?= $(CURDIR)/../..
+RIOTBASE ?= $(CURDIR)/../../RIOT

OlegHahm

diff --git a/.gitattributes b/.gitattributes
index 9ebeba488..92c34bd3e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,3 +5,4 @@
 # when the heading is exactly 7 characters long.
 *.md conflict-marker-size=100
 *.txt conflict-marker-size=100
+pkg/tweetnacl/*/* -diff
diff --git a/dist/tools/cppcheck/check.sh b/dist/tools/cppcheck/check.sh

OlegHahm

`--> git di origin/master dist/testbed-support                                                                                                                                   [11:28:28][0]
diff --git a/dist/testbed-support/Makefile.iotlab b/dist/testbed-support/Makefile.iotlab
index d92d716..4c19e66 100644
--- a/dist/testbed-support/Makefile.iotlab
+++ b/dist/testbed-support/Makefile.iotlab
@@ -10,6 +10,7 @@ IOTLAB_EXP_NAME     ?= RIOT_EXP
 IOTLAB_DEBUG_PORT   ?= 3333
 IOTLAB_DEBUG_NODE   ?= $(shell experiment-cli get -i $(IOTLAB_EXP_ID) --resources | \
                          grep -m 1 "network_address" | sed 's/.*-\([0-9]*\)\..*/\1/')
+IOTLAB_LOGGING      ?= 0

OlegHahm

diff --git a/dist/testbed-support/Makefile.iotlab b/dist/testbed-support/Makefile.iotlab
index 08acc4e..176cc1b 100644
--- a/dist/testbed-support/Makefile.iotlab
+++ b/dist/testbed-support/Makefile.iotlab
@@ -9,8 +9,7 @@ IOTLAB_EXP_ID       ?= $(shell experiment-cli get -l --state Running | grep -m 1
 IOTLAB_EXP_NAME     ?= RIOT_EXP
 IOTLAB_DEBUG_PORT   ?= 3333
 IOTLAB_DEBUG_NODE   ?= $(shell experiment-cli get -i $(IOTLAB_EXP_ID) --resources | \
-                         grep -m 1 "network_address" | sed 's/.*: "\(.*\)".*/\1/')
-IOTLAB_LOGGING      ?= 0

OlegHahm

==14712== Invalid read of size 1
==14712==    at 0x402CD88: strlen (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so)
==14712==    by 0x805058C: ccnl_helper_int (/home/oleg/git/miniature-dangerzone/ccnl_clustering/ccnl_helper.c:245)
==14712==    by 0x804F96A: _send_int (/home/oleg/git/miniature-dangerzone/ccnl_clustering/cluster.c:205)
==14712==    by 0x804F641: _loop (/home/oleg/git/miniature-dangerzone/ccnl_clustering/cluster.c:91)
==14712==    by 0x410CF0A: makecontext (in /usr/lib32/libc-2.23.so)
==14712==  Location 0x8085760 is 0 bytes inside _cluster_stack[11552],
==14712==  a global variable declared at cluster.c:12
==14712== 

OlegHahm

           CPU0       CPU1       CPU2       CPU3           
 16:          0          0          0          0  bcm2836-timer   0 Edge      arch_timer
 17:      10910       2347       3394       4444  bcm2836-timer   1 Edge      arch_timer
 23:         29          0          0          0  ARMCTRL-level   1 Edge      3f00b880.mailbox
 24:          2          0          0          0  ARMCTRL-level   2 Edge      VCHIQ doorbell
 46:          0          0          0          0  ARMCTRL-level  48 Edge      bcm2708_fb dma 
 48:       1662          0          0          0  ARMCTRL-level  50 Edge      DMA IRQ 
 50:         19          0          0          0  ARMCTRL-level  52 Edge      DMA IRQ 
 51:         19          0          0          0  ARMCTRL-level  53 Edge      DMA IRQ 
 62:     155501          0          0          0  ARMCTRL-level  64 Edge      dwc_otg, dwc_otg_pcd, dwc_otg_hcd:usb1

OlegHahm

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
index 3a91a8b..605291f 100644
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -142,3 +142,24 @@
                sd_debug     = <&sdhost>,"brcm,debug";
        };
 };
+
+&spi0 {

OlegHahm

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
index 3a91a8b..3ac572a 100644
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -68,6 +68,18 @@
                #size-cells = <0>;
                spi-max-frequency = <500000>;
        };
+
+    at86rf233@0 {

OlegHahm

 ------------------------
target: host-isl.prepare
------------------------

checking for a BSD-compatible install... /usr/lib/ptxdist-2016.02.0/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /usr/lib/ptxdist-2016.02.0/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes

OlegHahm

--------------------------
target: host-cloog.prepare
--------------------------

checking for a BSD-compatible install... /usr/lib/ptxdist-2016.02.0/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /usr/lib/ptxdist-2016.02.0/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes