Skip to content

Commit acdf1e3

Browse files
committed
Fix or remove invalid device names
The field device_name is intended to match that of a target in a device family pack. Remove this field for devices which do not have a pack. Fix the name for devices that have the name incorrect. Update IAR definitions for device which no longer have a device_name but still need to have support for the IAR exporter.
1 parent 8c91b41 commit acdf1e3

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

targets/targets.json

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "INTERRUPTIN", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE"],
227227
"default_lib": "small",
228228
"release_versions": ["2"],
229-
"device_name": "lpc1549"
229+
"device_name": "LPC1549JBD64"
230230
},
231231
"LPC1768": {
232232
"inherits": ["LPCTarget"],
@@ -632,7 +632,7 @@
632632
"detect_code": ["0217"],
633633
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
634634
"release_versions": ["2", "5"],
635-
"device_name" : "MK66FN256xxx15"
635+
"device_name" : "MK82FN256xxx15"
636636
},
637637
"NUCLEO_F030R8": {
638638
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -1073,7 +1073,7 @@
10731073
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2","USBHOST_OTHER"],
10741074
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"],
10751075
"release_versions": ["2", "5"],
1076-
"device_name": "stm32l476rg"
1076+
"device_name": "STM32L476RG"
10771077
},
10781078
"NUCLEO_L486RG": {
10791079
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -1085,7 +1085,7 @@
10851085
"detect_code": ["0827"],
10861086
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
10871087
"release_versions": ["2", "5"],
1088-
"device_name": "stm32l486rg"
1088+
"device_name": "STM32L486RG"
10891089
},
10901090
"STM32F3XX": {
10911091
"inherits": ["Target"],
@@ -1239,7 +1239,7 @@
12391239
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2", "USBHOST_OTHER"],
12401240
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"],
12411241
"release_versions": ["2", "5"],
1242-
"device_name": "stm32l476vg"
1242+
"device_name": "STM32L476VG"
12431243
},
12441244
"MTS_MDOT_F405RG": {
12451245
"inherits": ["Target"],
@@ -1827,8 +1827,7 @@
18271827
"macros": ["CMSDK_BEETLE", "WSF_MS_PER_TICK=20", "WSF_TOKEN_ENABLED=FALSE", "WSF_TRACE_ENABLED=TRUE", "WSF_ASSERT_ENABLED=FALSE", "WSF_PRINTF_MAX_LEN=128", "ASIC", "CONFIG_HOST_REV=0x20", "CONFIG_ALLOW_DEEP_SLEEP=FALSE", "HCI_VS_TARGET", "CONFIG_ALLOW_SETTING_WRITE=TRUE", "WSF_MAX_HANDLERS=20", "NO_LEDS"],
18281828
"device_has": ["ANALOGIN", "CLCD", "I2C", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "SLEEP", "SPI"],
18291829
"features": ["BLE"],
1830-
"release_versions": ["2", "5"],
1831-
"device_name": "beetle"
1830+
"release_versions": ["2", "5"]
18321831
},
18331832
"RZ_A1H": {
18341833
"supported_form_factors": ["ARDUINO"],
@@ -1839,8 +1838,7 @@
18391838
"inherits": ["Target"],
18401839
"device_has": ["ANALOGIN", "CAN", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
18411840
"features": ["LWIP"],
1842-
"release_versions": ["2", "5"],
1843-
"device_name": "r7s721001"
1841+
"release_versions": ["2", "5"]
18441842
},
18451843
"VK_RZ_A1H": {
18461844
"inherits": ["Target"],
@@ -1852,8 +1850,7 @@
18521850
"device_has": ["ANALOGIN", "CAN", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
18531851
"features": ["LWIP"],
18541852
"default_lib": "std",
1855-
"release_versions": ["2", "5"],
1856-
"device_name": "r7s721000"
1853+
"release_versions": ["2", "5"]
18571854
},
18581855
"MAXWSNENV": {
18591856
"inherits": ["Target"],
@@ -1872,8 +1869,7 @@
18721869
"extra_labels": ["Maxim", "MAX32600"],
18731870
"supported_toolchains": ["GCC_ARM", "IAR", "ARM"],
18741871
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "STDIO_MESSAGES"],
1875-
"release_versions": ["2", "5"],
1876-
"device_name": "max326000x85"
1872+
"release_versions": ["2", "5"]
18771873
},
18781874
"MAX32620HSP": {
18791875
"inherits": ["Target"],
@@ -2252,7 +2248,6 @@
22522248
"macros": ["EFR32MG1P233F256GM48", "TRANSACTION_QUEUE_SIZE_SPI=4"],
22532249
"supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
22542250
"release_versions": ["2", "5"],
2255-
"device_name": "EFR32MG1P233F256GM48",
22562251
"public": false
22572252
},
22582253
"EFR32MG1_BRD4150": {
@@ -2600,7 +2595,6 @@
26002595
"macros": ["CM3", "CPU_NCS36510", "TARGET_NCS36510", "LOAD_ADDRESS=0x3000"],
26012596
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
26022597
"device_has": ["ANALOGIN", "SERIAL", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "LOWPOWERTIMER", "TRNG"],
2603-
"device_name": "NCS36510",
26042598
"release_versions": ["2", "5"]
26052599
},
26062600
"NUMAKER_PFM_M453": {

tools/export/iar/iar_definitions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@
133133
"STM32F091RC": {
134134
"OGChipSelectEditMenu": "STM32F091RC\tST STM32F091RC"
135135
},
136-
"r7s721001": {
136+
"RZ_A1H": {
137137
"OGChipSelectEditMenu": "R7S721001\tRenesas R7S721001",
138138
"CoreVariant": 37,
139139
"GFPUCoreSlave": 37,
140140
"GBECoreSlave": 37,
141141
"NEON":1
142142
},
143-
"r7s721000": {
143+
"VK_RZ_A1H": {
144144
"OGChipSelectEditMenu": "R7S721000\tRenesas R7S721000",
145145
"CoreVariant": 37,
146146
"GFPUCoreSlave": 37,
@@ -153,7 +153,7 @@
153153
"STM32F031K6": {
154154
"OGChipSelectEditMenu": "STM32F031x6\tST STM32F031x6"
155155
},
156-
"max326000x85": {
156+
"MAX32600MBED": {
157157
"OGChipSelectEditMenu": "MAX32600x85\tMaxim MAX32600x85"
158158
},
159159
"STM32F407VG": {

0 commit comments

Comments
 (0)