merged conflict

Author: prashantrar

.travis.yml

@@ -1,3 +1,6 @@
+language: python
+python:
+    '2.7'
 
 env:
   global:
@@ -15,6 +18,7 @@ cache:
   pip: true
   directories:
     - $HOME/.cache/apt
+    - $HOME/gcc-arm-none-eabi-6-2017-q2-update
 
 before_install:
   - bash -c "$STATUS" pending "Local $NAME testing is in progress"
@@ -36,8 +40,7 @@ after_failure:
 
 matrix:
   include:
-    - python: '2.7'
-      env:
+    - env:
         - NAME=docs
       install:
         # Install dependencies
@@ -68,19 +71,13 @@ matrix:
           find  -name "*.s" | tee BUILD/badasm |
           sed -e "s/^/Bad Assembler file name found: /" && [ ! -s BUILD/badasm ]
 
-    - python: '2.7'
-      env:
+    - env:
         - NAME=tools
       install:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded
-        - pip install --user -r requirements.txt
-        - pip install --user pytest
-        - pip install --user pylint
-        - pip install --user hypothesis
-        - pip install --user mock
-        - pip install --user coverage
-        - pip install --user coveralls
+        - pip install -r requirements.txt
+        - pip install pytest pylint hypothesis mock coverage coveralls
         # Print versions we use
         - arm-none-eabi-gcc --version
         - python --version
@@ -96,14 +93,13 @@ matrix:
         # Report success since we have overridden default behaviour
         - bash -c "$STATUS" success "Local $NAME testing has passed"
 
-    - python: '2.7'
-      env:
+    - env:
         - NAME=events
         - EVENTS=events
       install:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded
-        - pip install --user -r requirements.txt
+        - pip install -r requirements.txt
         # Print versions we use
         - arm-none-eabi-gcc --version
         - gcc --version
@@ -115,14 +111,13 @@ matrix:
         # Run local equeue tests
         - make -C $EVENTS/equeue test
 
-    - python: '2.7'
-      env:
+    - env:
         - NAME=littlefs
         - LITTLEFS=features/filesystem/littlefs
       install:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded fuse libfuse-dev
-        - pip install --user -r requirements.txt
+        - pip install -r requirements.txt
         - git clone https://github.com/armmbed/spiflash-driver.git
         # Print versions
         - arm-none-eabi-gcc --version
@@ -162,13 +157,16 @@ matrix:
         - ls MOUNT/littlefs
         - CFLAGS="-Wno-format" make -CMOUNT/littlefs -B test_dirs QUIET=1
 
-    - python: '2.7'
-      env:
-        - NAME=mbed2
+    - &mbed-2
+      env: NAME=mbed2-NXP
       install:
         # Install dependencies
-        - sudo apt-get install gcc-arm-embedded
-        - pip install --user -r requirements.txt
+        - export GCC_DIR=$HOME/gcc-arm-none-eabi-6-2017-q2-update
+        - export GCC_ARCHIVE=$HOME/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
+        - export GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2?revision=2cc92fb5-3e0e-402d-9197-bdfc8224d8a5?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,6-2017-q2-update
+        - if [ ! -e $GCC_DIR/bin/arm-none-eabi-gcc ]; then wget $GCC_URL -O $GCC_ARCHIVE; tar xfj $GCC_ARCHIVE -C $HOME; fi
+        - export PATH=$PATH:$GCC_DIR/bin
+        - pip install -r requirements.txt
         # Print versions we use
         - arm-none-eabi-gcc --version
         - python --version
@@ -177,6 +175,18 @@ matrix:
         - mkdir BUILD
       script:
         # Run local mbed 2 testing
-        # Note: These take ~40 minutes to run
-        - python2 -u tools/build_travis.py | sed -n '/^Executing/p'
-
+        - python2 -u tools/build_travis.py --vendor "${NAME#mbed2-}"
+    - <<: *mbed-2
+      env: NAME=mbed2-STM
+    - <<: *mbed-2
+      env: NAME=mbed2-NORDIC
+    - <<: *mbed-2
+      env: NAME=mbed2-SILICON_LABS
+    - <<: *mbed-2
+      env: NAME=mbed2-MAXIM
+    - <<: *mbed-2
+      env: NAME=mbed2-ATMEL
+    - <<: *mbed-2
+      env: NAME=mbed2-NUVOTON
+    - <<: *mbed-2
+      env: NAME=mbed2-RENESAS

README.md

@@ -1,32 +1,35 @@
-# ARM mbed OS
+[![Mbed OS][mbed-os-logo]][mbed-os-link]
+
+[![Build status release][mbed-travis-release-svg]][mbed-travis-release] 
+[![Build status master][mbed-travis-master-svg]][mbed-travis-master] 
+[![Tools coverage status][mbed-coveralls-tools-svg]][mbed-coveralls-tools] 
+[![PR progress][mbed-waffle-svg]][mbed-waffle] 
+
+[mbed-os-logo]: logo.png
+[mbed-os-link]: https://www.mbed.com/en/platform/mbed-os/
+[mbed-travis-master]: https://travis-ci.org/ARMmbed/mbed-os
+[mbed-travis-master-svg]: https://travis-ci.org/ARMmbed/mbed-os.svg?branch=master
+[mbed-travis-release]: https://travis-ci.org/ARMmbed/mbed-os/branches
+[mbed-travis-release-svg]: https://travis-ci.org/ARMmbed/mbed-os.svg?branch=latest
+[mbed-coveralls-tools]: https://coveralls.io/github/ARMmbed/mbed-os?branch=master
+[mbed-coveralls-tools-svg]: https://coveralls.io/repos/github/ARMmbed/mbed-os/badge.svg?branch=master
+[mbed-waffle]: https://waffle.io/ARMmbed/mbed-os
+[mbed-waffle-svg]: https://badge.waffle.io/ARMmbed/mbed-os.svg?columns=all
+
+Arm Mbed OS is an open source embedded operating system designed specifically for the "things" in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices.
+
+Mbed OS provides a platform that includes:
+* Security foundations.
+* Cloud management services.
+* Drivers for sensors, I/O devices and connectivity. 
+
+## Release notes
+The [release notes](https://os.mbed.com/releases) detail the current release. You can also find information about previous versions.
+
+## Getting started for developers
 
-mbed OS is an open-source embedded operating system designed for the "things" in the Internet of Things (IoT). mbed OS includes the features you need to develop a connected product using an ARM Cortex-M microcontroller.
- 
-mbed OS provides a platform that includes:
- - Security foundations.
- - Cloud management services.
- - Drivers for sensors, I/O devices and connectivity.
-
-mbed OS is modular, configurable software that you can customize it to your device and to reduce memory requirements by excluding unused software.
-
- 
-## Release Notes
-
-The [Release Notes](https://docs.mbed.com/docs/mbed-os-release-notes/en/latest/) detail the current release and previous versions.
-
-## Continuous Integration Status
-
-We run continuous integration on all of our branches and pull requests to verify the stability of mbed OS. The following are the Travis CI indicators for mbed OS.
-
- - Master branch [![Master Branch CI Badge](https://travis-ci.org/ARMmbed/mbed-os.svg?branch=master)](https://travis-ci.org/ARMmbed/mbed-os)
- - Latest release [![Latest Tag CI Badge](https://travis-ci.org/ARMmbed/mbed-os.svg?branch=latest)](https://travis-ci.org/ARMmbed/mbed-os/branches)
-
-Tools coverage [![Coverage Status](https://coveralls.io/repos/github/ARMmbed/mbed-os/badge.svg?branch=master)](https://coveralls.io/github/ARMmbed/mbed-os?branch=master)
-
-## Getting Started for Developers
- 
-You need [mbed CLI](https://github.com/ARMmbed/mbed-cli) to build mbed OS. For more details, read the [mbed OS Handbook](https://docs.mbed.com/docs/mbed-os-handbook/en/latest/).
+We have a [developer webiste](https://os.mbed.com) for asking questions, engaging with others, finding information on boards and components, using an online IDE and compiler, reading the documentation and learning about what's new and what's coming next in Mbed OS.
 
-## Getting Started for Contributors
+## Getting started for contributors
 
-We have a [Contributing and Publishing Guide](https://docs.mbed.com/docs/mbed-os-handbook/en/latest/cont/contributing/) in the mbed OS Handbook.
+We also have a [contributing and publishing guide](https://os.mbed.com/contributing/) that covers licensing, contributor agreements and style guidelines.