Skip to content

Commit bee5cad

Browse files
committed
Remove IAR from all NRF51822-based targets
1 parent 21389cd commit bee5cad

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

workspace_tools/targets.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,20 +1214,20 @@ def __init__(self):
12141214
self.core = "Cortex-M0"
12151215
self.extra_labels = ["NORDIC", "MCU_NRF51", "MCU_NRF51822"]
12161216
self.macros = ['NRF51', 'TARGET_NRF51822']
1217-
self.supported_toolchains = ["ARM", "GCC_ARM", "IAR"]
1217+
self.supported_toolchains = ["ARM", "GCC_ARM"]
12181218
self.is_disk_virtual = True
12191219
self.detect_code = ["1070"]
12201220

12211221
def program_cycle_s(self):
12221222
return 6
12231223

12241224
def init_hooks(self, hook, toolchain_name):
1225-
if toolchain_name in ['ARM_STD', 'ARM_MICRO', 'GCC_ARM', 'IAR']:
1225+
if toolchain_name in ['ARM_STD', 'GCC_ARM']:
12261226
hook.hook_add_binary("post", self.binary_hook)
12271227

12281228
@staticmethod
12291229
def binary_hook(t_self, resources, elf, binf):
1230-
1230+
12311231
# Scan to find the actual paths of soft device
12321232
sdf = None
12331233
for softdeviceAndOffsetEntry in t_self.target.EXPECTED_SOFTDEVICES_WITH_OFFSETS:
@@ -1242,7 +1242,7 @@ def binary_hook(t_self, resources, elf, binf):
12421242
if sdf is None:
12431243
t_self.debug("Hex file not found. Aborting.")
12441244
return
1245-
1245+
12461246
# Look for bootloader file that matches this soft device or bootloader override image
12471247
blf = None
12481248
if t_self.target.MERGE_BOOTLOADER is True:
@@ -1274,7 +1274,7 @@ def binary_hook(t_self, resources, elf, binf):
12741274
with open(binf.replace(".bin", ".hex"), "w") as f:
12751275
binh.tofile(f, format='hex')
12761276

1277-
1277+
12781278
# 16KB Nordic targets are tight on SRAM using S130 (default) so we
12791279
# introduce two possible options:
12801280
# 1) Use S130 (default) - for this derive from MCU_NRF51_16K
@@ -1551,7 +1551,6 @@ def __init__(self):
15511551
class DELTA_DFCM_NNN40(MCU_NRF51_32K):
15521552
def __init__(self):
15531553
MCU_NRF51_32K.__init__(self)
1554-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15551554
self.macros += ['TARGET_NRF_LFCLK_RC']
15561555
self.progen = {
15571556
"target":"dfcm-nnn40",
@@ -1562,7 +1561,6 @@ def program_cycle_s(self):
15621561
class DELTA_DFCM_NNN40_BOOT(MCU_NRF51_32K_BOOT):
15631562
def __init__(self):
15641563
MCU_NRF51_32K_BOOT.__init__(self)
1565-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15661564
self.extra_labels += ['DELTA_DFCM_NNN40']
15671565
self.macros += ['TARGET_DELTA_DFCM_NNN40', 'TARGET_NRF_LFCLK_RC']
15681566
def program_cycle_s(self):
@@ -1571,7 +1569,6 @@ def program_cycle_s(self):
15711569
class DELTA_DFCM_NNN40_OTA(MCU_NRF51_32K_OTA):
15721570
def __init__(self):
15731571
MCU_NRF51_32K_OTA.__init__(self)
1574-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15751572
self.extra_labels += ['DELTA_DFCM_NNN40']
15761573
self.macros += ['TARGET_DELTA_DFCM_NNN40', 'TARGET_NRF_LFCLK_RC']
15771574
def program_cycle_s(self):
@@ -1580,7 +1577,6 @@ def program_cycle_s(self):
15801577
class NRF51_DK(MCU_NRF51_32K):
15811578
def __init__(self):
15821579
MCU_NRF51_32K.__init__(self)
1583-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15841580
self.supported_form_factors = ["ARDUINO"]
15851581
self.progen = {
15861582
"target":"nrf51-dk",
@@ -1591,15 +1587,13 @@ def __init__(self):
15911587
MCU_NRF51_32K_BOOT.__init__(self)
15921588
self.extra_labels += ['NRF51_DK']
15931589
self.macros += ['TARGET_NRF51_DK']
1594-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15951590
self.supported_form_factors = ["ARDUINO"]
15961591

15971592
class NRF51_DK_OTA(MCU_NRF51_32K_OTA):
15981593
def __init__(self):
15991594
MCU_NRF51_32K_OTA.__init__(self)
16001595
self.extra_labels += ['NRF51_DK']
16011596
self.macros += ['TARGET_NRF51_DK']
1602-
self.supported_toolchains = ["ARM", "GCC_ARM"]
16031597
self.supported_form_factors = ["ARDUINO"]
16041598

16051599
class NRF51_DONGLE(MCU_NRF51_32K):
@@ -1676,7 +1670,7 @@ def __init__(self):
16761670
self.macros += ['TARGET_TY51822R3', 'TARGET_NRF_32MHZ_XTAL']
16771671
self.supported_toolchains = ["ARM", "GCC_ARM"]
16781672

1679-
1673+
16801674
### ARM ###
16811675

16821676
class ARM_MPS2_Target(Target):
@@ -1736,7 +1730,7 @@ def __init__(self):
17361730
self.macros = ['CMSDK_CM7']
17371731
self.supported_toolchains = ["ARM"]
17381732
self.default_toolchain = "ARM"
1739-
1733+
17401734
class ARM_MPS2_BEID(ARM_MPS2_Target):
17411735
def __init__(self):
17421736
ARM_MPS2_Target.__init__(self)
@@ -1783,7 +1777,7 @@ def __init__(self):
17831777
self.supported_toolchains = ["GCC_ARM", "IAR", "ARM"]
17841778
self.default_toolchain = "ARM"
17851779
self.progen = {
1786-
"target": "maxwsnenv",
1780+
"target": "maxwsnenv",
17871781
}
17881782

17891783
class MAX32600MBED(Target):
@@ -1795,7 +1789,7 @@ def __init__(self):
17951789
self.supported_toolchains = ["GCC_ARM", "IAR", "ARM"]
17961790
self.default_toolchain = "ARM"
17971791
self.progen = {
1798-
"target": "max32600mbed",
1792+
"target": "max32600mbed",
17991793
}
18001794

18011795
### Silicon Labs ###
@@ -1886,7 +1880,7 @@ def __init__(self):
18861880
self.extra_labels = ['WIZNET', 'W7500x', 'WIZwiki_W7500ECO']
18871881
self.supported_toolchains = ["uARM", "ARM"]
18881882
self.default_toolchain = "ARM"
1889-
1883+
18901884
class SAMR21G18A(Target):
18911885
def __init__(self):
18921886
Target.__init__(self)

0 commit comments

Comments
 (0)