mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Merge pull request #14350 from LDong-Arm/fix_iar_config_conflict
ARM_MPS2_Target: Fix conflicts in IAR configurationpull/14271/head
						commit
						36b6013afe
					
				| 
						 | 
				
			
			@ -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",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue