Skip to content

Commit 36b6013

Browse files
authored
Merge pull request #14350 from LDong-Arm/fix_iar_config_conflict
ARM_MPS2_Target: Fix conflicts in IAR configuration
2 parents 7da6100 + c1d115e commit 36b6013

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

targets/targets.json

+5-10
Original file line numberDiff line numberDiff line change
@@ -4423,8 +4423,7 @@
44234423
"core": "Cortex-M0",
44244424
"supported_toolchains": [
44254425
"ARM",
4426-
"GCC_ARM",
4427-
"IAR"
4426+
"GCC_ARM"
44284427
],
44294428
"extra_labels": [
44304429
"ARM_SSG",
@@ -4465,8 +4464,7 @@
44654464
"core": "Cortex-M0+",
44664465
"supported_toolchains": [
44674466
"ARM",
4468-
"GCC_ARM",
4469-
"IAR"
4467+
"GCC_ARM"
44704468
],
44714469
"extra_labels": [
44724470
"ARM_SSG",
@@ -4505,8 +4503,7 @@
45054503
"core": "Cortex-M3",
45064504
"supported_toolchains": [
45074505
"ARM",
4508-
"GCC_ARM",
4509-
"IAR"
4506+
"GCC_ARM"
45104507
],
45114508
"extra_labels": [
45124509
"ARM_SSG",
@@ -4546,8 +4543,7 @@
45464543
"core": "Cortex-M4F",
45474544
"supported_toolchains": [
45484545
"ARM",
4549-
"GCC_ARM",
4550-
"IAR"
4546+
"GCC_ARM"
45514547
],
45524548
"extra_labels": [
45534549
"ARM_SSG",
@@ -4587,8 +4583,7 @@
45874583
"core": "Cortex-M7FD",
45884584
"supported_toolchains": [
45894585
"ARM",
4590-
"GCC_ARM",
4591-
"IAR"
4586+
"GCC_ARM"
45924587
],
45934588
"extra_labels": [
45944589
"ARM_SSG",

0 commit comments

Comments
 (0)