Merge pull request #1701 from alignan/pull/fix-temp-nordic-ppa

Fix broken nrf52dk Travis build

.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 &&

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 */

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)
+*/
 
 /** @} */
 /*---------------------------------------------------------------------------*/

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=