Redesign Nordic nRF51 MCU and derivative platforms to use class inheritance:

* add class to support both versions - 16K and 32K
* add class to support 2 modes - BOOT and (F)OTA
* change all classes to use the corresponding parent class

workspace_tools/targets.py

@@ -197,6 +197,14 @@ class LPC11U35_501_IBDAP(LPCTarget):
         self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CR" , "IAR"]
         self.default_toolchain = "uARM"
 
+class XADOW_M0(LPCTarget):
+    def __init__(self):
+        LPCTarget.__init__(self)
+        self.core = "Cortex-M0"
+        self.extra_labels = ['NXP', 'LPC11UXX', 'MCU_LPC11U35_501']
+        self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"]
+        self.default_toolchain = "uARM"
+
 class LPC11U35_Y5_MBUG(LPCTarget):
     def __init__(self):
         LPCTarget.__init__(self)
@@ -908,7 +916,7 @@ class NZ32SC151(Target):
 
 ### Nordic ###
 
-class NRF51822(Target):
+class MCU_NRF51(Target):
     # the following is a list of possible Nordic softdevices in decreasing order
     # of preference.
     EXPECTED_SOFTDEVICES_WITH_OFFSETS = [
@@ -946,9 +954,8 @@ class NRF51822(Target):
     def __init__(self):
         Target.__init__(self)
         self.core = "Cortex-M0"
-        self.extra_labels = ["NORDIC", "NRF51822_MKIT", "MCU_NRF51822", "MCU_NORDIC_16K"]
+        self.extra_labels = ["NORDIC", "MCU_NRF51", "MCU_NRF51822"]
-        self.common_macros = ['NRF51']
+        self.macros = ['NRF51', 'TARGET_NRF51822']
-        self.macros = self.common_macros
         self.supported_toolchains = ["ARM", "GCC_ARM", "IAR"]
         self.is_disk_virtual = True
         self.detect_code = ["1070"]
@@ -962,16 +969,24 @@ class NRF51822(Target):
 
     @staticmethod
     def binary_hook(t_self, resources, elf, binf):
-        # Scan to find the actual paths of soft device and bootloader files
+    
+        # Scan to find the actual paths of soft device
         sdf = None
-        blf = None
         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'])
+                    sdf = hexf
 
-                    # Look for bootloader file that matches this soft device
+                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
+            
+        # Look for bootloader file that matches this soft device or bootloader override image
+        blf = None
         if t_self.target.MERGE_BOOTLOADER is True:
             for hexf in resources.hex_files:
                 if hexf.find(t_self.target.OVERRIDE_BOOTLOADER_FILENAME) != -1:
@@ -982,15 +997,6 @@ class NRF51822(Target):
                     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
 
         # Merge user code with softdevice
         from intelhex import IntelHex
@@ -1010,154 +1016,236 @@ class NRF51822(Target):
         with open(binf.replace(".bin", ".hex"), "w") as f:
             binh.tofile(f, format='hex')
 
-class NRF51822_BOOT(NRF51822):
+            
+# 16KB MCU version, e.g. Nordic nRF51822, Seeed Arch BLE, etc.
+class MCU_NRF51_16K(MCU_NRF51):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51.__init__(self)
-        self.core = "Cortex-M0"
+        self.extra_labels += ['MCU_NORDIC_16K', 'MCU_NRF51_16K']
-        self.extra_labels = ["NORDIC", "NRF51822_MKIT", "MCU_NRF51822", "MCU_NORDIC_16K", "NRF51822"]
+        self.macros += ['TARGET_MCU_NORDIC_16K', 'TARGET_MCU_NRF51_16K']
-        self.macros = ['TARGET_NRF51822', 'TARGET_OTA_ENABLED']
+
-        self.macros += self.common_macros
+# derivative class used to create softdevice+bootloader enabled images
-        self.supported_toolchains = ["ARM", "GCC_ARM"]
+class MCU_NRF51_16K_BOOT(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+        self.extra_labels += ['MCU_NRF51_16K_BOOT']
+        self.macros += ['TARGET_MCU_NRF51_16K_BOOT', 'TARGET_OTA_ENABLED']
         self.MERGE_SOFT_DEVICE = True
         self.MERGE_BOOTLOADER = True
 
-class NRF51822_OTA(NRF51822):
+# derivative class used to create program only images for use with FOTA
+class MCU_NRF51_16K_OTA(MCU_NRF51_16K):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51_16K.__init__(self)
-        self.core = "Cortex-M0"
+        self.extra_labels += ['MCU_NRF51_16K_OTA']
-        self.extra_labels = ["NORDIC", "NRF51822_MKIT", "MCU_NRF51822", "MCU_NORDIC_16K", "NRF51822"]
+        self.macros += ['TARGET_MCU_NRF51_16K_OTA', 'TARGET_OTA_ENABLED']
-        self.macros = ['TARGET_NRF51822', 'TARGET_OTA_ENABLED']
-        self.macros += self.common_macros
-        self.supported_toolchains = ["ARM", "GCC_ARM"]
         self.MERGE_SOFT_DEVICE = False
 
-class NRF51_DK(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_32K']
-        self.macros = ['TARGET_NRF51822']
-        self.macros += self.common_macros
-        self.supported_form_factors = ["ARDUINO"]
 
-class NRF51_DK_BOOT(NRF51822):
+# 32KB MCU version, e.g. Nordic nRF51-DK, nRF51-Dongle, etc.
+class MCU_NRF51_32K(MCU_NRF51):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51.__init__(self)
-        self.core = "Cortex-M0"
+        self.extra_labels += ['MCU_NORDIC_32K', 'MCU_NRF51_32K']
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_32K', 'NRF51_DK']
+        self.macros += ['TARGET_MCU_NORDIC_32K', 'TARGET_MCU_NRF51_32K']
-        self.macros = ['TARGET_NRF51822', 'TARGET_NRF51_DK', 'TARGET_OTA_ENABLED']
+
-        self.macros += self.common_macros
+class MCU_NRF51_32K_BOOT(MCU_NRF51_32K):
-        self.supported_toolchains = ["ARM", "GCC_ARM"]
+    def __init__(self):
+        MCU_NRF51_32K.__init__(self)
+        self.extra_labels += ['MCU_NRF51_32K_BOOT']
+        self.macros += ['TARGET_MCU_NRF51_32K_BOOT', 'TARGET_OTA_ENABLED']
         self.MERGE_SOFT_DEVICE = True
         self.MERGE_BOOTLOADER = True
 
-class NRF51_DK_OTA(NRF51822):
+class MCU_NRF51_32K_OTA(MCU_NRF51_32K):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51_32K.__init__(self)
-        self.core = "Cortex-M0"
+        self.extra_labels += ['MCU_NRF51_32K_OTA']
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_32K', 'NRF51_DK']
+        self.macros += ['TARGET_MCU_NRF51_32K_OTA', 'TARGET_OTA_ENABLED']
-        self.macros = ['TARGET_NRF51822', 'TARGET_NRF51_DK', 'TARGET_OTA_ENABLED']
+        self.MERGE_SOFT_DEVICE = False
-        self.macros += self.common_macros
+
+#
+# nRF51 based development kits
+#
+
+# This one is special for legacy reasons
+class NRF51822(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+        self.extra_labels += ['NRF51822', 'NRF51822_MKIT']
+        self.macros += ['TARGET_NRF51822_MKIT']
+
+class NRF51822_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['NRF51822', 'NRF51822_MKIT']
+        self.macros += ['TARGET_NRF51822_MKIT']
+
+class NRF51822_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['NRF51822', 'NRF51822_MKIT']
+        self.macros += ['TARGET_NRF51822_MKIT']
+
+class ARCH_BLE(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+        self.supported_form_factors = ["ARDUINO"]
+
+class ARCH_BLE_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['ARCH_BLE']
+        self.macros += ['TARGET_ARCH_BLE']
+        self.supported_form_factors = ["ARDUINO"]
+
+class ARCH_BLE_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['ARCH_BLE']
+        self.macros += ['TARGET_ARCH_BLE']
+        self.supported_form_factors = ["ARDUINO"]
+
+class SEEED_TINY_BLE(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+
+class SEEED_TINY_BLE_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['SEEED_TINY_BLE']
+        self.macros += ['TARGET_SEEED_TINY_BLE']
+
+class SEEED_TINY_BLE_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['SEEED_TINY_BLE']
+        self.macros += ['TARGET_SEEED_TINY_BLE']
+
+class HRM1017(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+
+class HRM1017_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['HRM1017']
+        self.macros += ['TARGET_HRM1017']
+
+class HRM1017_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['HRM1017']
+        self.macros += ['TARGET_HRM1017']
+
+class RBLAB_NRF51822(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+        self.supported_form_factors = ["ARDUINO"]
+
+class RBLAB_NRF51822_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['RBLAB_NRF51822']
+        self.macros += ['TARGET_RBLAB_NRF51822']
+        self.supported_form_factors = ["ARDUINO"]
+
+class RBLAB_NRF51822_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['RBLAB_NRF51822']
+        self.macros += ['TARGET_RBLAB_NRF51822']
+        self.supported_form_factors = ["ARDUINO"]
+
+class RBLAB_BLENANO(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+
+class RBLAB_BLENANO_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['RBLAB_BLENANO']
+        self.macros += ['TARGET_RBLAB_BLENANO']
+
+class RBLAB_BLENANO_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['RBLAB_BLENANO']
+        self.macros += ['TARGET_RBLAB_BLENANO']
+
+class NRF51822_Y5_MBUG(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+
+class WALLBOT_BLE(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+
+class WALLBOT_BLE_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['WALLBOT_BLE']
+        self.macros += ['TARGET_WALLBOT_BLE']
+
+class WALLBOT_BLE_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['WALLBOT_BLE']
+        self.macros += ['TARGET_WALLBOT_BLE']
+
+class DELTA_DFCM_NNN40(MCU_NRF51_16K):
+    def __init__(self):
+        MCU_NRF51_16K.__init__(self)
+
+class DELTA_DFCM_NNN40_BOOT(MCU_NRF51_16K_BOOT):
+    def __init__(self):
+        MCU_NRF51_16K_BOOT.__init__(self)
+        self.extra_labels += ['DELTA_DFCM_NNN40']
+        self.macros += ['TARGET_DELTA_DFCM_NNN40']
+
+class DELTA_DFCM_NNN40_OTA(MCU_NRF51_16K_OTA):
+    def __init__(self):
+        MCU_NRF51_16K_OTA.__init__(self)
+        self.extra_labels += ['DELTA_DFCM_NNN40']
+        self.macros += ['TARGET_DELTA_DFCM_NNN40']
+
+class NRF51_DK(MCU_NRF51_32K):
+    def __init__(self):
+        MCU_NRF51_32K.__init__(self)
         self.supported_toolchains = ["ARM", "GCC_ARM"]
-        self.MERGE_SOFT_DEVICE = False
-
-class NRF51_DONGLE(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_32K']
-        self.macros = ['TARGET_NRF51822']
-        self.macros += self.common_macros
-
-class ARCH_BLE(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
-        self.macros = ['TARGET_NRF51822']
-        self.macros += self.common_macros
         self.supported_form_factors = ["ARDUINO"]
 
-class SEEED_TINY_BLE(NRF51822):
+class NRF51_DK_BOOT(MCU_NRF51_32K_BOOT):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51_32K_BOOT.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
+        self.extra_labels = ['NRF51_DK']
-        self.macros = ['TARGET_NRF51822']
+        self.macros += ['TARGET_NRF51_DK']
-        self.macros += self.common_macros
+        self.supported_toolchains = ["ARM", "GCC_ARM"]
-
-class SEEED_TINY_BLE_BOOT(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'SEEED_TINY_BLE']
-        self.macros = ['TARGET_NRF51822', 'TARGET_SEEED_TINY_BLE', 'TARGET_OTA_ENABLED']
-        self.macros += self.common_macros
-        self.MERGE_SOFT_DEVICE = True
-        self.MERGE_BOOTLOADER = True
-
-class SEEED_TINY_BLE_OTA(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'SEEED_TINY_BLE']
-        self.macros = ['TARGET_NRF51822', 'TARGET_SEEED_TINY_BLE', 'TARGET_OTA_ENABLED']
-        self.macros += self.common_macros
-        self.MERGE_SOFT_DEVICE = False
-
-class HRM1017(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
-        self.macros = ['TARGET_NRF51822']
-        self.macros += self.common_macros
-
-class RBLAB_NRF51822(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
-        self.macros = ['TARGET_NRF51822']
-        self.macros += self.common_macros
         self.supported_form_factors = ["ARDUINO"]
 
-class RBLAB_BLENANO(NRF51822):
+class NRF51_DK_OTA(MCU_NRF51_32K_OTA):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51_32K_OTA.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
+        self.extra_labels = ['NRF51_DK']
-        self.macros = ['TARGET_NRF51822']
+        self.macros += ['TARGET_NRF51_DK']
-        self.macros += self.common_macros
+        self.supported_toolchains = ["ARM", "GCC_ARM"]
+        self.supported_form_factors = ["ARDUINO"]
 
-class NRF51822_Y5_MBUG(NRF51822):
+class NRF51_DONGLE(MCU_NRF51_32K):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51_32K.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
-        self.macros = ['TARGET_NRF51822']
-        self.macros += self.common_macros
 
-class XADOW_M0(LPCTarget):
+class NRF51_DONGLE_BOOT(MCU_NRF51_32K_BOOT):
     def __init__(self):
-        LPCTarget.__init__(self)
+        MCU_NRF51_32K_BOOT.__init__(self)
-        self.core = "Cortex-M0"
+        self.extra_labels = ['NRF51_DONGLE']
-        self.extra_labels = ['NXP', 'LPC11UXX', 'MCU_LPC11U35_501']
+        self.macros += ['TARGET_NRF51_DONGLE']
-        self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CR", "IAR"]
-        self.default_toolchain = "uARM"
 
-class WALLBOT_BLE(NRF51822):
+class NRF51_DONGLE_OTA(MCU_NRF51_32K_OTA):
     def __init__(self):
-        NRF51822.__init__(self)
+        MCU_NRF51_32K_OTA.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
+        self.extra_labels = ['NRF51_DONGLE']
-        self.macros = ['TARGET_NRF51822']
+        self.macros += ['TARGET_NRF51_DONGLE']
-        self.macros += self.common_macros
-
-class DELTA_DFCM_NNN40(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.core = "Cortex-M0"
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
-        self.macros = ['TARGET_NRF51822']
-        self.macros += self.common_macros
-
-class DELTA_DFCM_NNN40_OTA(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.core = "Cortex-M0"
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'DELTA_DFCM_NNN40']
-        self.MERGE_SOFT_DEVICE = False
-        self.macros += self.common_macros
 
         
 ### ARM ###
@@ -1353,18 +1441,18 @@ TARGETS = [
     LPC11U34_421(),
     MICRONFCBOARD(),    # LPC11U34_421
     LPC11U35_401(),
-    LPC11U35_501(),
+    LPC11U35_501(),     # LPC11U35_501
-    LPC11U35_501_IBDAP(),
+    LPC11U35_501_IBDAP(), # LPC11U35_501
     XADOW_M0(),         # LPC11U35_501
-    LPC11U35_Y5_MBUG(),
+    LPC11U35_Y5_MBUG(), # LPC11U35_501
     LPC11U37_501(),
-    LPCCAPPUCCINO(),# LPC11U37_501
+    LPCCAPPUCCINO(),    # LPC11U37_501
     ARCH_GPRS(),        # LPC11U37_501
     LPC11U68(),
     LPC1114(),
     LPC1347(),
     LPC1549(),
-    LPC1768(),
+    LPC1768(),          # LPC1768
     ARCH_PRO(),         # LPC1768
     UBLOX_C027(),       # LPC1768
     XBED_LPC1768(),     # LPC1768
@@ -1428,24 +1516,37 @@ TARGETS = [
     NZ32SC151(),        # STM32L151
 
     ### Nordic ###
-    NRF51822(),
+    NRF51822(),             # nRF51_16K
-    NRF51822_BOOT(), # nRF51822
+    NRF51822_BOOT(),        # nRF51_16K
-    NRF51822_OTA(), # nRF51822
+    NRF51822_OTA(),         # nRF51_16K
-    NRF51_DK(),
+    ARCH_BLE(),             # nRF51_16K
-    NRF51_DK_BOOT(), # nRF51822
+    ARCH_BLE_BOOT(),        # nRF51_16K
-    NRF51_DK_OTA(), # nRF51822
+    ARCH_BLE_OTA(),         # nRF51_16K
-    NRF51_DONGLE(),
+    SEEED_TINY_BLE(),       # nRF51_16K
-    ARCH_BLE(),     # nRF51822
+    SEEED_TINY_BLE_BOOT(),  # nRF51_16K
-    SEEED_TINY_BLE(), # nRF51822
+    SEEED_TINY_BLE_OTA(),   # nRF51_16K
-    SEEED_TINY_BLE_BOOT(),# nRF51822
+    HRM1017(),              # nRF51_16K
-    SEEED_TINY_BLE_OTA(),# nRF51822
+    HRM1017_BOOT(),         # nRF51_16K
-    HRM1017(),      # nRF51822
+    HRM1017_OTA(),          # nRF51_16K
-    RBLAB_NRF51822(),# nRF51822
+    RBLAB_NRF51822(),       # nRF51_16K
-    RBLAB_BLENANO(),# nRF51822
+    RBLAB_NRF51822_BOOT(),  # nRF51_16K
-    NRF51822_Y5_MBUG(),#nRF51822
+    RBLAB_NRF51822_OTA(),   # nRF51_16K
-    WALLBOT_BLE(),  # nRF51822
+    RBLAB_BLENANO(),        # nRF51_16K
-    DELTA_DFCM_NNN40(), # nRF51822
+    RBLAB_BLENANO_BOOT(),   # nRF51_16K
-    DELTA_DFCM_NNN40_OTA(), # nRF51822
+    RBLAB_BLENANO_OTA(),    # nRF51_16K
+    NRF51822_Y5_MBUG(),     # nRF51_16K
+    WALLBOT_BLE(),          # nRF51_16K
+    WALLBOT_BLE_BOOT(),     # nRF51_16K
+    WALLBOT_BLE_OTA(),      # nRF51_16K
+    DELTA_DFCM_NNN40(),     # nRF51_16K
+    DELTA_DFCM_NNN40_BOOT(),# nRF51_16K
+    DELTA_DFCM_NNN40_OTA(), # nRF51_16K
+    NRF51_DK(),             # nRF51_32K
+    NRF51_DK_BOOT(),        # nRF51_32K
+    NRF51_DK_OTA(),         # nRF51_32K
+    NRF51_DONGLE(),         # nRF51_32K
+    NRF51_DONGLE_BOOT(),    # nRF51_32K
+    NRF51_DONGLE_OTA(),     # nRF51_32K
 
     ### ARM ###
     ARM_MPS2_M0(),