Support multiple SoftDevices for NRF51822 based platforms

Author: screamerbg

workspace_tools/targets.py

@@ -938,7 +938,7 @@ class NRF51822(Target):
             'offset' : 0x14000
         }
     ]
-    EXPECTED_BOOTLOADER_FILENAME = "nrf51822_bootloader.hex"
+    OVERRIDE_BOOTLOADER_FILENAME = "nrf51822_bootloader.hex"
     OUTPUT_EXT = 'hex'
     MERGE_SOFT_DEVICE = True
     MERGE_BOOTLOADER = False
@@ -965,21 +965,29 @@ def binary_hook(t_self, resources, elf, binf):
         # Scan to find the actual paths of soft device and bootloader files
         sdf = None
         blf = None
-        for hexf in resources.hex_files:
-            for softdeviceAndOffsetEntry in t_self.target.EXPECTED_SOFTDEVICES_WITH_OFFSETS:
+        for softdeviceAndOffsetEntry in t_self.target.EXPECTED_SOFTDEVICES_WITH_OFFSETS:
+            for hexf in resources.hex_files:
                 if hexf.find(softdeviceAndOffsetEntry['name']) != -1:
                     sdf = hexf
                     t_self.debug("SoftDevice file found %s." % softdeviceAndOffsetEntry['name'])
 
                     # Look for bootloader file that matches this soft device
                     if t_self.target.MERGE_BOOTLOADER is True:
                         for hexf in resources.hex_files:
-                            if hexf.find(softdeviceAndOffsetEntry['boot']) != -1:
+                            if hexf.find(t_self.target.OVERRIDE_BOOTLOADER_FILENAME) != -1:
+                                t_self.debug("Bootloader file found %s." % t_self.target.OVERRIDE_BOOTLOADER_FILENAME)
+                                blf = hexf
+                                break
+                            elif hexf.find(softdeviceAndOffsetEntry['boot']) != -1:
                                 t_self.debug("Bootloader file found %s." % softdeviceAndOffsetEntry['boot'])
                                 blf = hexf
                                 break
                     break
 
+                if sdf is not None: break
+                
+            if sdf is not None: break
+
         if sdf is None:
             t_self.debug("Hex file not found. Aborting.")
             return
@@ -995,7 +1003,7 @@ def binary_hook(t_self, resources, elf, binf):
             binh.merge(sdh)
 
         if t_self.target.MERGE_BOOTLOADER is True and blf is not None:
-            t_self.debug("Merge BootLoader file %s" % t_self.target.EXPECTED_BOOTLOADER_FILENAME)
+            t_self.debug("Merge BootLoader file %s" % blf)
             blh = IntelHex(blf)
             binh.merge(blh)