From a11269051b0bc367fa8fd79d673aafaa36c7ba24 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@ri.se>
Date: Sat, 18 Nov 2017 02:27:10 -0800
Subject: [PATCH] .travis.yml: use consistent ARM toolchain

---
 .travis.yml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 184545fae..a86e4654c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,14 +35,18 @@ before_script:
       msp430-gcc --version ;
     fi
 
-  ## Install mainline ARM toolchain and srecord.
+  ## Install mainline ARM toolchain, srecord and nRF52 SDK
   - if [ ${BUILD_ARCH:-0} = arm-aapcs ] ; then
       sudo apt-get -qq install srecord &&
       $WGET https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 &&
       tar xjf gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 -C /tmp/ &&
       sudo cp -f -r /tmp/gcc-arm-none-eabi-5_2-2015q4/* /usr/local/ &&
       rm -rf /tmp/gcc-arm-none-eabi-* gcc-arm-none-eabi-*-linux.tar.bz2 &&
-      arm-none-eabi-gcc --version ;
+      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 &&
+      unzip nrf5_iot_sdk_3288530.zip -d /tmp/nrf52-sdk &&
+      export NRF52_SDK_ROOT=/tmp/nrf52-sdk ;
     fi
 
   ## Install NXP toolchain
@@ -61,18 +65,6 @@ before_script:
       ba-elf-gcc --version ;
     fi
 
-  ## Install mainline ARM toolchain and download nRF52 SDK
-  - if [ ${BUILD_ARCH:-0} = nrf52dk ] ; then
-      sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa &&
-      sudo apt-get -qq update &&
-      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 &&
-      unzip nrf5_iot_sdk_3288530.zip -d /tmp/nrf52-sdk &&
-      export NRF52_SDK_ROOT=/tmp/nrf52-sdk ;
-    fi
-
   ## Compile cooja.jar only when it's going to be needed
   - if [ ${BUILD_CATEGORY:-0} = sim ] ; then
       java -version &&
@@ -101,7 +93,7 @@ env:
   - BUILD_TYPE='compile-base' BUILD_CATEGORY='compile' BUILD_ARCH='msp430'
   - BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
   - BUILD_TYPE='compile-nxp-ports' BUILD_CATEGORY='compile' BUILD_ARCH='jn516x'
-  - BUILD_TYPE='compile-nrf52-ports' BUILD_CATEGORY='compile' BUILD_ARCH='nrf52dk'
+  - BUILD_TYPE='compile-nrf52-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
   - BUILD_TYPE='compile-tools' BUILD_CATEGORY='compile'
   - BUILD_TYPE='rpl-lite' BUILD_CATEGORY='sim'
   - BUILD_TYPE='rpl-classic' BUILD_CATEGORY='sim'