From 688f4aefe0b2c2a57661a823a8096e7360fdc786 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 2 Jun 2016 09:32:24 +0200
Subject: [PATCH 1/3] Updates ARM toolchain to latest launchpad embedded
 version

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55b7d2f1d..41167da06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -96,9 +96,9 @@ before_script:
     
   ## Install mainline ARM toolchain and download nRF52 SDK
   - if [ ${BUILD_ARCH:-0} = nrf52dk ] ; then
-      sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded &&
+      sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa &&
       sudo apt-get -qq update &&
-      sudo apt-get -qq install gcc-arm-none-eabi srecord &&
+      sudo apt-get -qq install gcc-arm-embedded srecord &&
       arm-none-eabi-gcc --version &&
       $WGET https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip &&
       mkdir /tmp/nrf52-sdk &&

From 8cd075f3e50263fdda740956cf423a8f5d767efb Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 2 Jun 2016 10:02:32 +0200
Subject: [PATCH 2/3] Moved regression test to new placeholder

---
 .../{23-compile-nrf52-ports => 24-compile-nrf52-ports}/Makefile   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename regression-tests/{23-compile-nrf52-ports => 24-compile-nrf52-ports}/Makefile (100%)

diff --git a/regression-tests/23-compile-nrf52-ports/Makefile b/regression-tests/24-compile-nrf52-ports/Makefile
similarity index 100%
rename from regression-tests/23-compile-nrf52-ports/Makefile
rename to regression-tests/24-compile-nrf52-ports/Makefile

From 7dd2f1144bfd56a2374839482646231cb926c95e Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 2 Jun 2016 10:17:57 +0200
Subject: [PATCH 3/3] Disabled rtimer redefinition, removed outdated address
 print and timer-test from regression tests

---
 platform/nrf52dk/contiki-main.c                  | 8 +++-----
 platform/nrf52dk/platform-conf.h                 | 2 +-
 regression-tests/24-compile-nrf52-ports/Makefile | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/platform/nrf52dk/contiki-main.c b/platform/nrf52dk/contiki-main.c
index 50fcfcd28..9181d7faf 100644
--- a/platform/nrf52dk/contiki-main.c
+++ b/platform/nrf52dk/contiki-main.c
@@ -110,7 +110,7 @@ static void
 board_init(void)
 {
 #ifdef SOFTDEVICE_PRESENT
-  // Initialize the SoftDevice handler module.
+  /* Initialize the SoftDevice handler module */
   SOFTDEVICE_HANDLER_INIT(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM, NULL);
 #endif
 #ifdef PLATFORM_HAS_BUTTON
@@ -167,12 +167,10 @@ main(void)
   netstack_init();
   linkaddr_t linkaddr;
   ble_get_mac(linkaddr.u8);
-  // Set link layer address
+  /* Set link layer address */
   linkaddr_set_node_addr(&linkaddr);
-  // Set device link layer address in uip stack.
+  /* Set device link layer address in uip stack */
   memcpy(&uip_lladdr.addr, &linkaddr, sizeof(uip_lladdr.addr));
-  uip_debug_lladdr_print(&uip_lladdr);
-  PRINTF("\n");
   process_start(&ble_iface_observer, NULL);
   process_start(&tcpip_process, NULL);
 #endif /* NETSTACK_CONF_WITH_IPV6 */
diff --git a/platform/nrf52dk/platform-conf.h b/platform/nrf52dk/platform-conf.h
index 931a3c275..bb073f4ab 100644
--- a/platform/nrf52dk/platform-conf.h
+++ b/platform/nrf52dk/platform-conf.h
@@ -132,9 +132,9 @@ typedef uint32_t uip_stats_t;
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
  * RTIMER_CLOCK_LT to override this
- */
 typedef uint32_t rtimer_clock_t;
 #define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+*/
 
 /** @} */
 /*---------------------------------------------------------------------------*/
diff --git a/regression-tests/24-compile-nrf52-ports/Makefile b/regression-tests/24-compile-nrf52-ports/Makefile
index 5e9ee19de..c165d569d 100644
--- a/regression-tests/24-compile-nrf52-ports/Makefile
+++ b/regression-tests/24-compile-nrf52-ports/Makefile
@@ -8,11 +8,10 @@ TOOLSDIR=../../tools
  
 EXAMPLES = \
 hello-world/nrf52dk \
-nrf52dk/blink-hello/nrf52dk \
 nrf52dk/coap-demo/nrf52dk:coap-server \
 nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
 nrf52dk/mqtt-demo/nrf52dk \
-nrf52dk/timer-test/nrf52dk
+nrf52dk/blink-hello/nrf52dk
 
 TOOLS=