From 0d0e44036b32a82e6280c4da9bd676e32be497f7 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 10 Jan 2016 16:07:38 +0000 Subject: [PATCH 1/2] Change travis arm tests to use gcc-arm-embedded v5 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a9affd3c..1814ee6fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,9 +44,9 @@ before_script: ## in Ubuntu >= 14.04, but this external PPA is needed for 12.04. ## Install srecord - if [ ${BUILD_ARCH:-0} = arm-aapcs ] ; 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 ; fi From 9e9e6d07b060ca3720e3d454bfaeb662c376bbdd Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 24 Jan 2016 13:53:54 +0000 Subject: [PATCH 2/2] Adjust READMEs to point explicitly to the arm-gcc version used by travis --- platform/cc2538dk/README.md | 20 +++++++------------- platform/srf06-cc26xx/README.md | 13 ++++++++----- platform/zoul/README.md | 21 +++++++-------------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/platform/cc2538dk/README.md b/platform/cc2538dk/README.md index 809f46d6a..998a574b3 100644 --- a/platform/cc2538dk/README.md +++ b/platform/cc2538dk/README.md @@ -66,21 +66,15 @@ The platform has been developed and tested under Windows XP, Mac OS X 10.9.1 and Install a Toolchain ------------------- -The toolchain used to build contiki is arm-gcc, also used by other arm-based Contiki ports. If you are using Instant Contiki, you will have a version pre-installed in your system. To find out if this is the case, try this: +The toolchain used to build contiki is arm-gcc, also used by other arm-based Contiki ports. If you are using Instant Contiki, you may have a version pre-installed in your system. - $ arm-none-eabi-gcc -v - Using built-in specs. - Target: arm-none-eabi - Configured with: /scratch/julian/lite-respin/eabi/src/gcc-4.3/configure - ... - (skip) - ... - Thread model: single - gcc version 4.3.2 (Sourcery G++ Lite 2008q3-66) +The platform is currently being used/tested with "GNU Tools for ARM Embedded Processors" (). The current recommended version and the one being used by Contiki's regression tests on Travis is shown below. -The platform is currently being used/tested with "GNU Tools for ARM Embedded Processors". This is the recommended version and the one being used by Contiki's regression tests on Travis. - -The older version (Sourcery G++ Lite 2008q3-66) shown above should still work, but the port is no longer being tested with it. + $ arm-none-eabi-gcc --version + arm-none-eabi-gcc (GNU Tools for ARM Embedded Processors) 5.2.1 20151202 (release) [ARM/embedded-5-branch revision 231848] + Copyright (C) 2015 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Drivers ------- diff --git a/platform/srf06-cc26xx/README.md b/platform/srf06-cc26xx/README.md index f17d50a61..32071745c 100644 --- a/platform/srf06-cc26xx/README.md +++ b/platform/srf06-cc26xx/README.md @@ -58,12 +58,15 @@ To use the port you need: Note that uploading over serial doesn't work for the Sensortag, you can use TI's SmartRF Flash Programmer in this case. * A toolchain to build firmware: The port has been developed and tested with - GNU Tools for ARM Embedded Processors . - The port was developed and tested using this version: + GNU Tools for ARM Embedded Processors (). + The current recommended version and the one being used by Contiki's regression + tests on Travis is shown below. - $ arm-none-eabi-gcc -v - [...] - gcc version 4.9.3 20141119 (release) [ARM/embedded-4_9-branch revision 218278] (GNU Tools for ARM Embedded Processors) + $ arm-none-eabi-gcc --version + arm-none-eabi-gcc (GNU Tools for ARM Embedded Processors) 5.2.1 20151202 (release) [ARM/embedded-5-branch revision 231848] + Copyright (C) 2015 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * srecord (http://srecord.sourceforge.net/) * You may also need other drivers so that the SmartRF can communicate with your diff --git a/platform/zoul/README.md b/platform/zoul/README.md index d8eb07bfd..dc2960909 100644 --- a/platform/zoul/README.md +++ b/platform/zoul/README.md @@ -74,22 +74,15 @@ To start using Contiki, the following is required: Install a Toolchain ------------------- -The toolchain used to build contiki is arm-gcc, also used by other arm-based Contiki ports. If you are using Instant Contiki, you will have a version pre-installed in your system. To find out if this is the case, try this: +The toolchain used to build contiki is arm-gcc, also used by other arm-based Contiki ports. If you are using Instant Contiki, you may have a version pre-installed in your system. - $ arm-none-eabi-gcc -v - Using built-in specs. - Target: arm-none-eabi - Configured with: /scratch/julian/lite-respin/eabi/src/gcc-4.3/configure - ... - (skip) - ... - Thread model: single - gcc version 4.3.2 (Sourcery G++ Lite 2008q3-66) +The platform is currently being used/tested with "GNU Tools for ARM Embedded Processors" (). The current recommended version and the one being used by Contiki's regression tests on Travis is shown below. -The platform is currently being used/tested with the following toolchains: - -* GNU Tools for ARM Embedded Processors. This is the recommended version. Works nicely on OS X. -* Alternatively, you can use this older version for Linux. At the time of writing, this is the version used by Contiki's regression tests. + $ arm-none-eabi-gcc --version + arm-none-eabi-gcc (GNU Tools for ARM Embedded Processors) 5.2.1 20151202 (release) [ARM/embedded-5-branch revision 231848] + Copyright (C) 2015 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Drivers -------