ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Squashed commit of the following (#1149 PR on github): 

commit 4810979575d8feccff1d6dc75ab24e3753c4e0f0
Merge: 83c82b0 0e23067
Author: 0xc0170 <c0170@rocketmail.com>
Date:   Wed Jun 3 08:06:14 2015 +0100

    Merge branch 'master' of https://github.com/screamerbg/mbed into screamerbg-master

commit 0e23067718
Author: Mihail Stoyanov <wm@smode.org>
Date:   Tue Jun 2 16:08:08 2015 +0300

    Add the Delta NNN40 platform to releases

commit 62a585dcda
Merge: e1cd545 7a1d25e
Author: Mihail Stoyanov <wm@smode.org>
Date:   Tue Jun 2 16:06:44 2015 +0300

    Merge branch 'master' of https://github.com/mbedmicro/mbed

    Conflicts:
    	workspace_tools/tests.py

commit e1cd545a9c
Merge: 5c5e61f ffd5586
Author: Mihail Stoyanov <wm@smode.org>
Date:   Thu May 7 13:07:48 2015 +0300

    Merge branch 'master' of https://github.com/mbedmicro/mbed

commit 5c5e61f0ac
Author: Mihail Stoyanov <wm@smode.org>
Date:   Thu May 7 13:07:35 2015 +0300

    Remove the Disco L053 from RTOS tests as it's not ready yet

commit e75efe3467
Author: Mihail Stoyanov <wm@smode.org>
Date:   Wed May 6 13:49:05 2015 +0300

    Tidy up targets.py
pull/1149/merge
0xc0170 2015-06-03 08:07:07 +01:00
parent 83c82b06fc
commit 4b93618af6
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
workspace_tools/build_release.py
View File

@ -87,6 +87,7 @@ OFFICIAL_MBED_LIBRARY_BUILD = (
('RBLAB_NRF51822', ('ARM', 'GCC_ARM')),
('RBLAB_BLENANO', ('ARM', 'GCC_ARM')),
('WALLBOT_BLE', ('ARM', 'GCC_ARM')),
('DELTA_DFCM_NNN40', ('ARM', 'GCC_ARM')),
('LPC11U68', ('ARM', 'uARM','GCC_ARM','GCC_CR', 'IAR')),
('OC_MBUINO', ('ARM', 'uARM', 'GCC_ARM', 'IAR')),

53
workspace_tools/targets.py
View File

@ -844,7 +844,6 @@ class NZ32ST1L(Target):
self.default_toolchain = "uARM"
### Nordic ###
class NRF51822(Target):
@ -1078,58 +1077,74 @@ class DELTA_DFCM_NNN40_OTA(NRF51822):
self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'DELTA_DFCM_NNN40']
self.MERGE_SOFT_DEVICE = False
self.macros += self.common_macros
### ARM ###
class ARM_MPS2_M0(Target):
class ARM_MPS2_Target(Target):
def __init__(self):
Target.__init__(self)
self.OUTPUT_EXT = 'axf'
def init_hooks(self, hook, toolchain_name):
hook.hook_add_binary("replace", self.output_axf)
@staticmethod
def output_axf(t_self, resources, elf, bin):
shutil.copy(elf, bin)
t_self.debug("Passing ELF file %s" % bin)
class ARM_MPS2_M0(ARM_MPS2_Target):
def __init__(self):
ARM_MPS2_Target.__init__(self)
self.core = "Cortex-M0"
self.extra_labels = ['ARM_SSG', 'MPS2_M0']
self.extra_labels = ['ARM_SSG', 'MPS2', 'MPS2_M0']
self.macros = ['CMSDK_CM0']
self.supported_toolchains = ["ARM", "GCC_ARM"]
self.default_toolchain = "ARM"
class ARM_MPS2_M0P(Target):
class ARM_MPS2_M0P(ARM_MPS2_Target):
def __init__(self):
Target.__init__(self)
ARM_MPS2_Target.__init__(self)
self.core = "Cortex-M0+"
self.extra_labels = ['ARM_SSG', 'MPS2_M0P']
self.extra_labels = ['ARM_SSG', 'MPS2', 'MPS2_M0P']
self.macros = ['CMSDK_CM0plus']
self.supported_toolchains = ["ARM", "GCC_ARM"]
self.default_toolchain = "ARM"
class ARM_MPS2_M1(Target):
class ARM_MPS2_M1(ARM_MPS2_Target):
def __init__(self):
Target.__init__(self)
ARM_MPS2_Target.__init__(self)
self.core = "Cortex-M1"
self.extra_labels = ['ARM_SSG', 'MPS2_M1']
self.extra_labels = ['ARM_SSG', 'MPS2', 'MPS2_M1']
self.macros = ['CMSDK_CM1']
self.supported_toolchains = ["ARM", "GCC_ARM"]
self.default_toolchain = "ARM"
class ARM_MPS2_M3(Target):
class ARM_MPS2_M3(ARM_MPS2_Target):
def __init__(self):
Target.__init__(self)
ARM_MPS2_Target.__init__(self)
self.core = "Cortex-M3"
self.extra_labels = ['ARM_SSG', 'MPS2_M3']
self.extra_labels = ['ARM_SSG', 'MPS2', 'MPS2_M3']
self.macros = ['CMSDK_CM3']
self.supported_toolchains = ["ARM", "GCC_ARM"]
self.default_toolchain = "ARM"
class ARM_MPS2_M4(Target):
class ARM_MPS2_M4(ARM_MPS2_Target):
def __init__(self):
Target.__init__(self)
ARM_MPS2_Target.__init__(self)
self.core = "Cortex-M4F"
self.extra_labels = ['ARM_SSG', 'MPS2_M4']
self.extra_labels = ['ARM_SSG', 'MPS2', 'MPS2_M4']
self.macros = ['CMSDK_CM4']
self.supported_toolchains = ["ARM", "GCC_ARM"]
self.default_toolchain = "ARM"
class ARM_MPS2_M7(Target):
class ARM_MPS2_M7(ARM_MPS2_Target):
def __init__(self):
Target.__init__(self)
ARM_MPS2_Target.__init__(self)
self.core = "Cortex-M7F"
self.extra_labels = ['ARM_SSG', 'MPS2_M7']
self.extra_labels = ['ARM_SSG', 'MPS2', 'MPS2_M7']
self.macros = ['CMSDK_CM7']
self.supported_toolchains = ["ARM", "GCC_ARM"]
self.default_toolchain = "ARM"
@ -1173,7 +1188,9 @@ class MAX32600MBED(Target):
self.supported_toolchains = ["GCC_ARM", "IAR", "ARM"]
self.default_toolchain = "ARM"
### Silicon Labs ###
class EFM32GG_STK3700(Target):
def __init__(self):
Target.__init__(self)