Merge pull request ARMmbed#480 from ytsuboi/master

[nRF51822] Fixed support for Nordic parts with 16k RAM
arebert · Sep 9, 2014 · f50e6f3 · f50e6f3
2 parents 82ec8c2 + 2009f7e
commit f50e6f3
Showing 1 changed file with 30 additions and 28 deletions.
diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py
@@ -469,6 +469,36 @@ def binary_hook(t_self, resources, elf, binf):
             sdh.tofile(f, format='hex')
 
 
+class ARCH_BLE(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
+        self.macros = ['TARGET_NRF51822']
+        self.supported_form_factors = ["ARDUINO"]
+
+
+class HRM1017(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
+        self.macros = ['TARGET_NRF51822']
+
+
+class RBLAB_NRF51822(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
+        self.macros = ['TARGET_NRF51822']
+
+
+class NRF51_DK(NRF51822):
+    def __init__(self):
+        NRF51822.__init__(self)
+        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_32K']
+        self.macros = ['TARGET_NRF51822']
+        self.supported_form_factors = ["ARDUINO"]
+
+
 class LPC1549(LPCTarget):
     def __init__(self):
         LPCTarget.__init__(self)
@@ -541,20 +571,6 @@ def __init__(self):
         self.default_toolchain = "uARM"
 
 
-class ARCH_BLE(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
-        self.macros = ['TARGET_NRF51822']
-        self.supported_form_factors = ["ARDUINO"]
-
-class NRF51_DK(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_32K']
-        self.macros = ['TARGET_NRF51822']
-        self.supported_form_factors = ["ARDUINO"]
-
 class ARCH_PRO(LPCTarget):
     def __init__(self):
         LPCTarget.__init__(self)
@@ -580,13 +596,6 @@ def __init__(self):
         LPC11U37_501.__init__(self)
 
 
-class HRM1017(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822']
-        self.macros = ['TARGET_NRF51822']
-
-
 class ARM_MPS2(Target):
     def __init__(self):
         Target.__init__(self)
@@ -596,13 +605,6 @@ def __init__(self):
         self.default_toolchain = "ARM"
 
 
-class RBLAB_NRF51822(NRF51822):
-    def __init__(self):
-        NRF51822.__init__(self)
-        self.extra_labels = ['NORDIC', 'MCU_NRF51822']
-        self.macros = ['TARGET_NRF51822']
-
-
 class OC_MBUINO(LPC11U24):
     def __init__(self):
         LPC11U24.__init__(self)