Merge pull request #14350 from LDong-Arm/fix_iar_config_conflict

ARM_MPS2_Target: Fix conflicts in IAR configuration
pull/14271/head
Martin Kojtal 2021-02-25 13:18:45 +00:00 committed by GitHub
commit 36b6013afe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions

View File

@ -4423,8 +4423,7 @@
"core": "Cortex-M0",
"supported_toolchains": [
"ARM",
"GCC_ARM",
"IAR"
"GCC_ARM"
],
"extra_labels": [
"ARM_SSG",
@ -4465,8 +4464,7 @@
"core": "Cortex-M0+",
"supported_toolchains": [
"ARM",
"GCC_ARM",
"IAR"
"GCC_ARM"
],
"extra_labels": [
"ARM_SSG",
@ -4505,8 +4503,7 @@
"core": "Cortex-M3",
"supported_toolchains": [
"ARM",
"GCC_ARM",
"IAR"
"GCC_ARM"
],
"extra_labels": [
"ARM_SSG",
@ -4546,8 +4543,7 @@
"core": "Cortex-M4F",
"supported_toolchains": [
"ARM",
"GCC_ARM",
"IAR"
"GCC_ARM"
],
"extra_labels": [
"ARM_SSG",
@ -4587,8 +4583,7 @@
"core": "Cortex-M7FD",
"supported_toolchains": [
"ARM",
"GCC_ARM",
"IAR"
"GCC_ARM"
],
"extra_labels": [
"ARM_SSG",