Update docs for embedded platforms, frameworks and boards

docs/frameworks/arduino.rst

@@ -151,7 +151,7 @@ Adafruit
     * - ``protrinket3ftdi``
       - `Adafruit Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
-      - 16 MHz
+      - 12 MHz
       - 32 Kb
       - 2 Kb
 

docs/frameworks/mbed.rst

@@ -266,6 +266,26 @@ Freescale
       - 256 Kb
       - 32 Kb
 
+Generic
+~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``bluepill_f103c8``
+      - `BluePill F103C8 <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html>`_
+      - STM32F103C8T6
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
 JKSoft
 ~~~~~~
 

docs/platforms/atmelavr.rst

@@ -28,21 +28,34 @@ Packages
     * - Name
       - Contents
 
-    * - ``toolchain-atmelavr``
-      - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_, `GDB <http://www.gnu.org/software/gdb/>`_, `AVaRICE <http://avarice.sourceforge.net/>`_, `SimulAVR <http://www.nongnu.org/simulavr/>`_
-
-    * - ``tool-avrdude``
-      - `AVRDUDE <http://www.nongnu.org/avrdude/>`_
+    * - ``framework-arduinoavr``
+      - `Arduino Wiring-based Framework (AVR Core, 1.6) <http://arduino.cc/en/Reference/HomePage>`_
 
     * - ``framework-simba``
       - `Simba Framework <https://github.com/eerimoq/simba>`_
 
-    * - ``framework-arduinoavr``
-      - `Arduino Wiring-based Framework (AVR Core, 1.6) <http://arduino.cc/en/Reference/HomePage>`_
+    * - ``tool-avrdude``
+      - `AVRDUDE <http://www.nongnu.org/avrdude/>`_
 
     * - ``tool-micronucleus``
       - `Micronucleus <https://github.com/micronucleus/micronucleus>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
+    * - ``toolchain-atmelavr``
+      - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_, `GDB <http://www.gnu.org/software/gdb/>`_, `AVaRICE <http://avarice.sourceforge.net/>`_, `SimulAVR <http://www.nongnu.org/simulavr/>`_
+
+.. warning::
+    **Linux Users:** Don't forget to install "udev" rules file
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
+
+
+
 Frameworks
 ----------
 .. list-table::
@@ -124,7 +137,7 @@ Adafruit
     * - ``protrinket3ftdi``
       - `Adafruit Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
-      - 16 MHz
+      - 12 MHz
       - 32 Kb
       - 2 Kb
 

docs/platforms/atmelsam.rst

@@ -28,30 +28,30 @@ Packages
     * - Name
       - Contents
 
-    * - ``framework-mbed``
-      - `mbed Framework <http://mbed.org>`_
-
-    * - ``toolchain-gccarmnoneeabi``
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
-
     * - ``framework-arduinosam``
       - `Arduino Wiring-based Framework (SAM Core, 1.6) <http://arduino.cc/en/Reference/HomePage>`_
 
-    * - ``ldscripts``
-      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
+    * - ``framework-mbed``
+      - `mbed Framework <http://mbed.org>`_
 
     * - ``framework-simba``
       - `Simba Framework <https://github.com/eerimoq/simba>`_
 
-    * - ``tool-openocd``
-      - `OpenOCD <http://openocd.org>`_
-
     * - ``tool-avrdude``
       - `AVRDUDE <http://www.nongnu.org/avrdude/>`_
 
     * - ``tool-bossac``
       - `BOSSA CLI <https://sourceforge.net/projects/b-o-s-s-a/>`_
 
+    * - ``tool-openocd``
+      - `OpenOCD <http://openocd.org>`_
+
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
@@ -73,12 +73,12 @@ Frameworks
     * - :ref:`framework_arduino`
       - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences.
 
-    * - :ref:`framework_mbed`
-      - The mbed framework The mbed SDK has been designed to provide enough hardware abstraction to be intuitive and concise, yet powerful enough to build complex projects. It is built on the low-level ARM CMSIS APIs, allowing you to code down to the metal if needed. In addition to RTOS, USB and Networking libraries, a cookbook of hundreds of reusable peripheral and module libraries have been built on top of the SDK by the mbed Developer Community.
-
     * - :ref:`framework_simba`
       - Simba is an RTOS and build framework. It aims to make embedded programming easy and portable.
 
+    * - :ref:`framework_mbed`
+      - The mbed framework The mbed SDK has been designed to provide enough hardware abstraction to be intuitive and concise, yet powerful enough to build complex projects. It is built on the low-level ARM CMSIS APIs, allowing you to code down to the metal if needed. In addition to RTOS, USB and Networking libraries, a cookbook of hundreds of reusable peripheral and module libraries have been built on top of the SDK by the mbed Developer Community.
+
 Boards
 ------
 

docs/platforms/embedded_boards.rst

@@ -137,7 +137,7 @@ Adafruit
     * - ``protrinket3ftdi``
       - `Adafruit Pro Trinket 3V/12MHz (FTDI) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
-      - 16 MHz
+      - 12 MHz
       - 32 Kb
       - 2 Kb
 
@@ -1123,6 +1123,26 @@ Fubarino
       - 512 Kb
       - 128 Kb
 
+Generic
+~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``bluepill_f103c8``
+      - `BluePill F103C8 <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html>`_
+      - STM32F103C8T6
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
 Generic ATTiny
 ~~~~~~~~~~~~~~
 

docs/platforms/espressif.rst

@@ -28,26 +28,26 @@ Packages
     * - Name
       - Contents
 
-    * - ``toolchain-xtensa``
-      - `xtensa-gcc <https://github.com/jcmvbkbc/gcc-xtensa>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+    * - ``framework-arduinoespressif``
+      - `Arduino Wiring-based Framework (ESP8266 Core) <https://github.com/esp8266/Arduino>`_
 
     * - ``framework-simba``
       - `Simba Framework <https://github.com/eerimoq/simba>`_
 
+    * - ``sdk-esp8266``
+      - `ESP8266 SDK <http://bbs.espressif.com>`_
+
     * - ``tool-esptool``
       - `esptool-ck <https://github.com/igrr/esptool-ck>`_
 
     * - ``tool-mkspiffs``
       - `Tool to build and unpack SPIFFS images <https://github.com/igrr/mkspiffs>`_
 
-    * - ``framework-arduinoespressif``
-      - `Arduino Wiring-based Framework (ESP8266 Core) <https://github.com/esp8266/Arduino>`_
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
 
-    * - ``ldscripts``
-      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
-
-    * - ``sdk-esp8266``
-      - `ESP8266 SDK <http://bbs.espressif.com>`_
+    * - ``toolchain-xtensa``
+      - `xtensa-gcc <https://github.com/jcmvbkbc/gcc-xtensa>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file

docs/platforms/freescalekinetis.rst

@@ -31,6 +31,9 @@ Packages
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 

docs/platforms/intel_arc32.rst

@@ -34,6 +34,9 @@ Packages
     * - ``tool-arduino101load``
       - `Genuino101 uploader <https://github.com/01org/intel-arduino-tools>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-intelarc32``
       - `GCC for Intel ARC <https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain>`_
 

docs/platforms/lattice_ice40.rst

@@ -28,6 +28,9 @@ Packages
     * - Name
       - Contents
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-icestorm``
       - `GCC for FPGA IceStorm <http://www.clifford.at/icestorm/>`_
 

docs/platforms/linux_arm.rst

@@ -31,6 +31,9 @@ Packages
     * - ``framework-wiringpi``
       - `GPIO Interface library for the Raspberry Pi <http://wiringpi.com>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-gccarmlinuxgnueabi``
       - `GCC for Linux ARM GNU EABI <https://gcc.gnu.org>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 

docs/platforms/linux_i686.rst

@@ -28,5 +28,8 @@ Packages
     * - Name
       - Contents
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-gcclinux32``
       - `GCC for Linux i686 <https://gcc.gnu.org>`_

docs/platforms/linux_x86_64.rst

@@ -15,7 +15,7 @@ Platform ``linux_x86_64``
 =========================
 Linux x86_64 (64-bit) is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X or Linux 64-bit) you can build native application for Linux x86_64 platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_i686>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_x86_64>`_.
 
 .. contents::
 
@@ -28,5 +28,8 @@ Packages
     * - Name
       - Contents
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-gcclinux64``
       - `GCC for Linux x86_64 <https://gcc.gnu.org>`_

docs/platforms/microchippic32.rst

@@ -31,12 +31,15 @@ Packages
     * - ``framework-arduinomicrochippic32``
       - `Arduino Wiring-based Framework (PIC32 Core) <https://github.com/chipKIT32/chipKIT-core>`_
 
-    * - ``toolchain-microchippic32``
-      - `GCC for Microchip PIC32 <https://github.com/chipKIT32/chipKIT-cxx>`_
-
     * - ``tool-pic32prog``
       - `pic32prog <https://github.com/sergev/pic32prog>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
+    * - ``toolchain-microchippic32``
+      - `GCC for Microchip PIC32 <https://github.com/chipKIT32/chipKIT-cxx>`_
+
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).

docs/platforms/native.rst

@@ -17,4 +17,16 @@ Native development platform is intended to be used for desktop OS. This platform
 
 For more detailed information please visit `vendor site <http://platformio.org/platforms/native>`_.
 
-.. contents::
+.. contents::
+
+Packages
+--------
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Contents
+
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_

docs/platforms/nordicnrf51.rst

@@ -28,20 +28,23 @@ Packages
     * - Name
       - Contents
 
+    * - ``framework-arduinonordicnrf51``
+      - `Arduino Wiring-based Framework (RFduino Core) <https://github.com/RFduino/RFduino>`_
+
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
     * - ``tool-rfdloader``
       - `rfdloader <https://github.com/RFduino/RFduino>`_
 
-    * - ``toolchain-gccarmnoneeabi``
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
 
     * - ``tool-sreccat``
       - `Merging tool <https://github.com/marcows/SRecord>`_
 
-    * - ``framework-arduinonordicnrf51``
-      - `Arduino Wiring-based Framework (RFduino Core) <https://github.com/RFduino/RFduino>`_
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file

docs/platforms/nxplpc.rst

@@ -31,6 +31,9 @@ Packages
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 

docs/platforms/siliconlabsefm32.rst

@@ -31,6 +31,9 @@ Packages
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 

docs/platforms/ststm32.rst

@@ -28,26 +28,26 @@ Packages
     * - Name
       - Contents
 
-    * - ``framework-libopencm3``
-      - `libOpenCM3 Framework <http://www.libopencm3.org/>`_
-
-    * - ``toolchain-gccarmnoneeabi``
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
-
-    * - ``tool-stlink``
-      - `ST-Link <https://github.com/texane/stlink>`_
-
-    * - ``framework-spl``
-      - `Standard Peripheral Library for STM32 MCUs <http://www.st.com/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890>`_
-
     * - ``framework-cmsis``
       - `Vendor-independent hardware abstraction layer for the Cortex-M processor series <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php>`_
 
+    * - ``framework-libopencm3``
+      - `libOpenCM3 Framework <http://www.libopencm3.org/>`_
+
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
-    * - ``ldscripts``
-      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
+    * - ``framework-spl``
+      - `Standard Peripheral Library for STM32 MCUs <http://www.st.com/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890>`_
+
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
+    * - ``tool-stlink``
+      - `ST-Link <https://github.com/texane/stlink>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
@@ -73,12 +73,12 @@ Frameworks
     * - :ref:`framework_libopencm3`
       - The libOpenCM3 framework aims to create a free/libre/open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC 11xx, 13xx, 15xx, 17xx parts, Atmel SAM3, Energy Micro EFM32 and others.
 
-    * - :ref:`framework_mbed`
-      - The mbed framework The mbed SDK has been designed to provide enough hardware abstraction to be intuitive and concise, yet powerful enough to build complex projects. It is built on the low-level ARM CMSIS APIs, allowing you to code down to the metal if needed. In addition to RTOS, USB and Networking libraries, a cookbook of hundreds of reusable peripheral and module libraries have been built on top of the SDK by the mbed Developer Community.
-
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 Cortex-M3 family. The idea is to save the user (the new user, in particular) having to deal directly with the registers.
 
+    * - :ref:`framework_mbed`
+      - The mbed framework The mbed SDK has been designed to provide enough hardware abstraction to be intuitive and concise, yet powerful enough to build complex projects. It is built on the low-level ARM CMSIS APIs, allowing you to code down to the metal if needed. In addition to RTOS, USB and Networking libraries, a cookbook of hundreds of reusable peripheral and module libraries have been built on top of the SDK by the mbed Developer Community.
+
 Boards
 ------
 
@@ -142,6 +142,26 @@ Armstrap
       - 512 Kb
       - 192 Kb
 
+Generic
+~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``bluepill_f103c8``
+      - `BluePill F103C8 <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html>`_
+      - STM32F103C8T6
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
 MultiTech
 ~~~~~~~~~
 

docs/platforms/teensy.rst

@@ -15,7 +15,7 @@ Platform ``teensy``
 ===================
 Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
 
-For more detailed information please visit `vendor site <https://www.pjrc.com/teensy>`_.
+For more detailed information please visit `vendor site <ttps://www.pjrc.com/teensy>`_.
 
 .. contents::
 
@@ -31,20 +31,20 @@ Packages
     * - ``framework-arduinoteensy``
       - `Arduino Wiring-based Framework <http://arduino.cc/en/Reference/HomePage>`_
 
-    * - ``tool-teensy``
-      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
-
-    * - ``toolchain-gccarmnoneeabi``
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
-
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
+    * - ``tool-teensy``
+      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
+
     * - ``toolchain-atmelavr``
       - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_, `GDB <http://www.gnu.org/software/gdb/>`_, `AVaRICE <http://avarice.sourceforge.net/>`_, `SimulAVR <http://www.nongnu.org/simulavr/>`_
 
-    * - ``ldscripts``
-      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file

docs/platforms/timsp430.rst

@@ -28,17 +28,20 @@ Packages
     * - Name
       - Contents
 
-    * - ``toolchain-timsp430``
-      - `msp-gcc <http://sourceforge.net/projects/mspgcc/>`_, `GDB <http://www.gnu.org/software/gdb/>`_
-
-    * - ``tool-mspdebug``
-      - `MSPDebug <http://mspdebug.sourceforge.net/>`_
+    * - ``framework-arduinomsp430``
+      - `Arduino Wiring-based Framework (MSP430 Core) <http://arduino.cc/en/Reference/HomePage>`_
 
     * - ``framework-energiamsp430``
       - `Energia Wiring-based Framework (MSP430 Core) <http://energia.nu/reference/>`_
 
-    * - ``framework-arduinomsp430``
-      - `Arduino Wiring-based Framework (MSP430 Core) <http://arduino.cc/en/Reference/HomePage>`_
+    * - ``tool-mspdebug``
+      - `MSPDebug <http://mspdebug.sourceforge.net/>`_
+
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
+    * - ``toolchain-timsp430``
+      - `msp-gcc <http://sourceforge.net/projects/mspgcc/>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file

docs/platforms/titiva.rst

@@ -28,20 +28,20 @@ Packages
     * - Name
       - Contents
 
-    * - ``ldscripts``
-      - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
+    * - ``framework-energiativa``
+      - `Energia Wiring-based Framework (LM4F Core) <http://energia.nu/reference/>`_
 
     * - ``framework-libopencm3``
       - `libOpenCM3 Framework <http://www.libopencm3.org/>`_
 
-    * - ``toolchain-gccarmnoneeabi``
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
-
     * - ``tool-lm4flash``
       - `Flash Programmer <http://www.ti.com/tool/lmflashprogrammer>`_
 
-    * - ``framework-energiativa``
-      - `Energia Wiring-based Framework (LM4F Core) <http://energia.nu/reference/>`_
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
@@ -61,12 +61,12 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_energia`
-      - Energia Wiring-based framework enables pretty much anyone to start easily creating microcontroller-based projects and applications. Its easy-to-use libraries and functions provide developers of all experience levels to start blinking LEDs, buzzing buzzers and sensing sensors more quickly than ever before.
-
     * - :ref:`framework_libopencm3`
       - The libOpenCM3 framework aims to create a free/libre/open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC 11xx, 13xx, 15xx, 17xx parts, Atmel SAM3, Energy Micro EFM32 and others.
 
+    * - :ref:`framework_energia`
+      - Energia Wiring-based framework enables pretty much anyone to start easily creating microcontroller-based projects and applications. Its easy-to-use libraries and functions provide developers of all experience levels to start blinking LEDs, buzzing buzzers and sensing sensors more quickly than ever before.
+
 Boards
 ------
 

docs/platforms/windows_x86.rst

@@ -28,5 +28,8 @@ Packages
     * - Name
       - Contents
 
+    * - ``tool-scons``
+      - `SCons software construction tool <http://www.scons.org>`_
+
     * - ``toolchain-gccmingw32``
       - `MinGW <http://www.mingw.org>`_