Fix: IAR build for NRF5x produce proper combined intel-hex file.

Author: nvlsianpu

hal/targets.json

@@ -1124,7 +1124,7 @@
         "detect_code": ["1070"],
         "post_binary_hook": {
             "function": "MCU_NRF51Code.binary_hook",
-            "toolchains": ["ARM_STD", "GCC_ARM"]
+            "toolchains": ["ARM_STD", "GCC_ARM", "IAR"]
         },
         "program_cycle_s": 6,
         "features": ["BLE"]
@@ -1743,7 +1743,7 @@
         ],
         "post_binary_hook": {
             "function": "MCU_NRF51Code.binary_hook",
-            "toolchains": ["ARM_STD", "GCC_ARM"]
+            "toolchains": ["ARM_STD", "GCC_ARM", "IAR"]
         },
         "MERGE_BOOTLOADER": false,
         "features": ["BLE"]

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/sdk/libraries/bootloader_dfu/bootloader_settings.c

@@ -35,7 +35,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-
+#ifdef NORDIC_BOOTLOADER_SETTINGS // avoid from unwanted commpilation
 
 #include "bootloader_settings.h"
 #include <stdint.h>
@@ -88,3 +88,5 @@ void bootloader_util_settings_get(const bootloader_settings_t ** pp_bootloader_s
 
     *pp_bootloader_settings = p_bootloader_settings;
 }
+
+#endif // NORDIC_BOOTLOADER

tools/toolchains/iar.py

@@ -198,7 +198,7 @@ def archive(self, objects, lib_path):
     @hook_tool
     def binary(self, resources, elf, bin):
         # Build binary command
-        cmd = [self.elf2bin, "--ihex", elf, bin]
+        cmd = [self.elf2bin, "--bin", elf, bin]
 
         # Call cmdline hook
         cmd = self.hook.get_cmdline_binary(cmd)