Skip to content

Commit 3209e18

Browse files
committed
Merge pull request #1569 from bridadan/remove-iar-nrf51822
Remove IAR from all NRF51822-based targets
2 parents 73deb0b + bee5cad commit 3209e18

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
@@ -1228,20 +1228,20 @@ def __init__(self):
12281228
self.core = "Cortex-M0"
12291229
self.extra_labels = ["NORDIC", "MCU_NRF51", "MCU_NRF51822"]
12301230
self.macros = ['NRF51', 'TARGET_NRF51822']
1231-
self.supported_toolchains = ["ARM", "GCC_ARM", "IAR"]
1231+
self.supported_toolchains = ["ARM", "GCC_ARM"]
12321232
self.is_disk_virtual = True
12331233
self.detect_code = ["1070"]
12341234

12351235
def program_cycle_s(self):
12361236
return 6
12371237

12381238
def init_hooks(self, hook, toolchain_name):
1239-
if toolchain_name in ['ARM_STD', 'ARM_MICRO', 'GCC_ARM', 'IAR']:
1239+
if toolchain_name in ['ARM_STD', 'GCC_ARM']:
12401240
hook.hook_add_binary("post", self.binary_hook)
12411241

12421242
@staticmethod
12431243
def binary_hook(t_self, resources, elf, binf):
1244-
1244+
12451245
# Scan to find the actual paths of soft device
12461246
sdf = None
12471247
for softdeviceAndOffsetEntry in t_self.target.EXPECTED_SOFTDEVICES_WITH_OFFSETS:
@@ -1256,7 +1256,7 @@ def binary_hook(t_self, resources, elf, binf):
12561256
if sdf is None:
12571257
t_self.debug("Hex file not found. Aborting.")
12581258
return
1259-
1259+
12601260
# Look for bootloader file that matches this soft device or bootloader override image
12611261
blf = None
12621262
if t_self.target.MERGE_BOOTLOADER is True:
@@ -1288,7 +1288,7 @@ def binary_hook(t_self, resources, elf, binf):
12881288
with open(binf.replace(".bin", ".hex"), "w") as f:
12891289
binh.tofile(f, format='hex')
12901290

1291-
1291+
12921292
# 16KB Nordic targets are tight on SRAM using S130 (default) so we
12931293
# introduce two possible options:
12941294
# 1) Use S130 (default) - for this derive from MCU_NRF51_16K
@@ -1565,7 +1565,6 @@ def __init__(self):
15651565
class DELTA_DFCM_NNN40(MCU_NRF51_32K):
15661566
def __init__(self):
15671567
MCU_NRF51_32K.__init__(self)
1568-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15691568
self.macros += ['TARGET_NRF_LFCLK_RC']
15701569
self.progen = {
15711570
"target":"dfcm-nnn40",
@@ -1576,7 +1575,6 @@ def program_cycle_s(self):
15761575
class DELTA_DFCM_NNN40_BOOT(MCU_NRF51_32K_BOOT):
15771576
def __init__(self):
15781577
MCU_NRF51_32K_BOOT.__init__(self)
1579-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15801578
self.extra_labels += ['DELTA_DFCM_NNN40']
15811579
self.macros += ['TARGET_DELTA_DFCM_NNN40', 'TARGET_NRF_LFCLK_RC']
15821580
def program_cycle_s(self):
@@ -1585,7 +1583,6 @@ def program_cycle_s(self):
15851583
class DELTA_DFCM_NNN40_OTA(MCU_NRF51_32K_OTA):
15861584
def __init__(self):
15871585
MCU_NRF51_32K_OTA.__init__(self)
1588-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15891586
self.extra_labels += ['DELTA_DFCM_NNN40']
15901587
self.macros += ['TARGET_DELTA_DFCM_NNN40', 'TARGET_NRF_LFCLK_RC']
15911588
def program_cycle_s(self):
@@ -1594,7 +1591,6 @@ def program_cycle_s(self):
15941591
class NRF51_DK(MCU_NRF51_32K):
15951592
def __init__(self):
15961593
MCU_NRF51_32K.__init__(self)
1597-
self.supported_toolchains = ["ARM", "GCC_ARM"]
15981594
self.supported_form_factors = ["ARDUINO"]
15991595
self.progen = {
16001596
"target":"nrf51-dk",
@@ -1605,15 +1601,13 @@ def __init__(self):
16051601
MCU_NRF51_32K_BOOT.__init__(self)
16061602
self.extra_labels += ['NRF51_DK']
16071603
self.macros += ['TARGET_NRF51_DK']
1608-
self.supported_toolchains = ["ARM", "GCC_ARM"]
16091604
self.supported_form_factors = ["ARDUINO"]
16101605

16111606
class NRF51_DK_OTA(MCU_NRF51_32K_OTA):
16121607
def __init__(self):
16131608
MCU_NRF51_32K_OTA.__init__(self)
16141609
self.extra_labels += ['NRF51_DK']
16151610
self.macros += ['TARGET_NRF51_DK']
1616-
self.supported_toolchains = ["ARM", "GCC_ARM"]
16171611
self.supported_form_factors = ["ARDUINO"]
16181612

16191613
class NRF51_DONGLE(MCU_NRF51_32K):
@@ -1690,7 +1684,7 @@ def __init__(self):
16901684
self.macros += ['TARGET_TY51822R3', 'TARGET_NRF_32MHZ_XTAL']
16911685
self.supported_toolchains = ["ARM", "GCC_ARM"]
16921686

1693-
1687+
16941688
### ARM ###
16951689

16961690
class ARM_MPS2_Target(Target):
@@ -1750,7 +1744,7 @@ def __init__(self):
17501744
self.macros = ['CMSDK_CM7']
17511745
self.supported_toolchains = ["ARM"]
17521746
self.default_toolchain = "ARM"
1753-
1747+
17541748
class ARM_MPS2_BEID(ARM_MPS2_Target):
17551749
def __init__(self):
17561750
ARM_MPS2_Target.__init__(self)
@@ -1797,7 +1791,7 @@ def __init__(self):
17971791
self.supported_toolchains = ["GCC_ARM", "IAR", "ARM"]
17981792
self.default_toolchain = "ARM"
17991793
self.progen = {
1800-
"target": "maxwsnenv",
1794+
"target": "maxwsnenv",
18011795
}
18021796

18031797
class MAX32600MBED(Target):
@@ -1809,7 +1803,7 @@ def __init__(self):
18091803
self.supported_toolchains = ["GCC_ARM", "IAR", "ARM"]
18101804
self.default_toolchain = "ARM"
18111805
self.progen = {
1812-
"target": "max32600mbed",
1806+
"target": "max32600mbed",
18131807
}
18141808

18151809
### Silicon Labs ###
@@ -1900,7 +1894,7 @@ def __init__(self):
19001894
self.extra_labels = ['WIZNET', 'W7500x', 'WIZwiki_W7500ECO']
19011895
self.supported_toolchains = ["uARM", "ARM"]
19021896
self.default_toolchain = "ARM"
1903-
1897+
19041898
class SAMR21G18A(Target):
19051899
def __init__(self):
19061900
Target.__init__(self)

0 commit comments

Comments
 (0)