From 9d1128af51b7706c7c43d06850d3363864270885 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 2 Aug 2016 21:06:50 +0300
Subject: [PATCH] Implement firmware merging with base firmware for Nordic
 nRF51 development platform // Resolve #500 , Resolve #533

---
 HISTORY.rst                          | 3 +++
 docs/platforms/creating_platform.rst | 3 +++
 docs/platforms/nordicnrf51.rst       | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index fef30cf6..69caccf1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -19,6 +19,9 @@ PlatformIO 2.0
   (`issue #733 <https://github.com/platformio/platformio/issues/733>`_)
 * Updated ``udev`` rules for the new STM32F407DISCOVERY boards
   (`issue #731 <https://github.com/platformio/platformio/issues/731>`_)
+* Implemented firmware merging with base firmware for Nordic nRF51 development platform
+  (`issue #500 <https://github.com/platformio/platformio/issues/500>`_,
+  `issue #533 <https://github.com/platformio/platformio/issues/533>`_)
 * Fixed Project Generator for ESP8266 and ARM mbed based projects
   (resolves incorrect linter errors)
 * Fixed broken LD Script for Element14 chipKIT Pi board
diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index 913fb40d..09e11695 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -143,6 +143,9 @@ Packages
     * - ``tool-scons``
       - `SCons software construction tool <http://www.scons.org>`_
 
+    * - ``tool-sreccat``
+      - `Merging tool <https://github.com/marcows/SRecord>`_
+
     * - ``tool-stlink``
       - `ST-Link <https://github.com/texane/stlink>`_
 
diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst
index 4c4d65fe..fff500b3 100644
--- a/docs/platforms/nordicnrf51.rst
+++ b/docs/platforms/nordicnrf51.rst
@@ -37,6 +37,9 @@ Packages
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
+    * - ``tool-sreccat``
+      - `Merging tool <https://github.com/marcows/SRecord>`_
+
     * - ``framework-arduinonordicnrf51``
       - `Arduino Wiring-based Framework (RFduino Core) <https://github.com/RFduino/RFduino>`_