Skip to content

Commit fcb2f21

Browse files
c1728p90xc0170
authored andcommitted
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 45fa0f2 commit fcb2f21

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"],
@@ -1086,7 +1086,7 @@
10861086
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2","USBHOST_OTHER"],
10871087
"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"],
10881088
"release_versions": ["2", "5"],
1089-
"device_name": "stm32l486rg"
1089+
"device_name": "STM32L486RG"
10901090
},
10911091
"STM32F3XX": {
10921092
"inherits": ["Target"],
@@ -1240,7 +1240,7 @@
12401240
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2", "USBHOST_OTHER"],
12411241
"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"],
12421242
"release_versions": ["2", "5"],
1243-
"device_name": "stm32l476vg"
1243+
"device_name": "STM32L476VG"
12441244
},
12451245
"MTS_MDOT_F405RG": {
12461246
"inherits": ["Target"],
@@ -1828,8 +1828,7 @@
18281828
"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"],
18291829
"device_has": ["ANALOGIN", "CLCD", "I2C", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "SLEEP", "SPI"],
18301830
"features": ["BLE"],
1831-
"release_versions": ["2", "5"],
1832-
"device_name": "beetle"
1831+
"release_versions": ["2", "5"]
18331832
},
18341833
"RZ_A1H": {
18351834
"supported_form_factors": ["ARDUINO"],
@@ -1840,8 +1839,7 @@
18401839
"inherits": ["Target"],
18411840
"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"],
18421841
"features": ["LWIP"],
1843-
"release_versions": ["2", "5"],
1844-
"device_name": "r7s721001"
1842+
"release_versions": ["2", "5"]
18451843
},
18461844
"VK_RZ_A1H": {
18471845
"inherits": ["Target"],
@@ -1853,8 +1851,7 @@
18531851
"device_has": ["ANALOGIN", "CAN", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
18541852
"features": ["LWIP"],
18551853
"default_lib": "std",
1856-
"release_versions": ["2", "5"],
1857-
"device_name": "r7s721000"
1854+
"release_versions": ["2", "5"]
18581855
},
18591856
"MAXWSNENV": {
18601857
"inherits": ["Target"],
@@ -1873,8 +1870,7 @@
18731870
"extra_labels": ["Maxim", "MAX32600"],
18741871
"supported_toolchains": ["GCC_ARM", "IAR", "ARM"],
18751872
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "STDIO_MESSAGES"],
1876-
"release_versions": ["2", "5"],
1877-
"device_name": "max326000x85"
1873+
"release_versions": ["2", "5"]
18781874
},
18791875
"MAX32620HSP": {
18801876
"inherits": ["Target"],
@@ -2253,7 +2249,6 @@
22532249
"macros": ["EFR32MG1P233F256GM48", "TRANSACTION_QUEUE_SIZE_SPI=4"],
22542250
"supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
22552251
"release_versions": ["2", "5"],
2256-
"device_name": "EFR32MG1P233F256GM48",
22572252
"public": false
22582253
},
22592254
"EFR32MG1_BRD4150": {
@@ -2601,7 +2596,6 @@
26012596
"macros": ["CM3", "CPU_NCS36510", "TARGET_NCS36510", "LOAD_ADDRESS=0x3000"],
26022597
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
26032598
"device_has": ["ANALOGIN", "SERIAL", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "LOWPOWERTIMER", "TRNG"],
2604-
"device_name": "NCS36510",
26052599
"release_versions": ["2", "5"]
26062600
},
26072601
"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)