Skip to content

Commit 44eca95

Browse files
authored
Merge pull request #3028 from maclobdell/ncs36510_exporter_definitions
add ncs36510 exporter support for IAR
2 parents 5bcebba + e1657f1 commit 44eca95

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

targets/TARGET_ONSEMI/TARGET_NCS36510/swversion.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
* $Rev: 2199 $
88
* $Date: 2013-08-07 12:17:27 +0200 (Wed, 07 Aug 2013) $
99
******************************************************************************
10-
* Copyright 2016 Semiconductor Components Industries LLC (d/b/a ON Semiconductor).
10+
* Copyright 2016 Semiconductor Components Industries LLC (d/b/a "ON Semiconductor").
1111
* All rights reserved. This software and/or documentation is licensed by ON Semiconductor
1212
* under limited terms and conditions. The terms and conditions pertaining to the software
1313
* and/or documentation are available at http://www.onsemi.com/site/pdf/ONSEMI_T&C.pdf
14-
* (ON Semiconductor Standard Terms and Conditions of Sale, Section 8 Software) and
14+
* ("ON Semiconductor Standard Terms and Conditions of Sale, Section 8 Software") and
1515
* if applicable the software license agreement. Do not use this software and/or
1616
* documentation unless you have carefully read and you agree to the limited terms and
1717
* conditions. By using this software and/or documentation, you agree to the limited
@@ -37,7 +37,7 @@
3737
* *
3838
*************************************************************************************************/
3939

40-
#ifdef IAR
40+
#ifdef __ICCARM__
4141
/** Define a fib table constant region, to be located at fixed offset in the binary
4242
* such that flash loader knows where to find it and gets the build dependent data
4343
* it needs for programming the new fib.

targets/targets.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2106,9 +2106,10 @@
21062106
"core": "Cortex-M3",
21072107
"extra_labels": ["ONSEMI"],
21082108
"post_binary_hook": {"function": "NCS36510TargetCode.ncs36510_addfib"},
2109-
"macros": ["REVD", "CM3", "CPU_NCS36510", "TARGET_NCS36510"],
2109+
"macros": ["REVD", "CM3", "CPU_NCS36510", "TARGET_NCS36510", "LOAD_ADDRESS=0x3000"],
21102110
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
21112111
"device_has": ["ANALOGIN", "SERIAL", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "LOWPOWERTIMER"],
2112+
"device_name": "NCS36510",
21122113
"release_versions": ["2", "5"]
21132114
},
21142115
"NUMAKER_PFM_M453": {

tools/export/iar/iar_definitions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,8 @@
149149
},
150150
"nRF52832_xxAA":{
151151
"OGChipSelectEditMenu": "nRF52832-xxAA\tNordicSemi nRF52832-xxAA"
152+
},
153+
"NCS36510":{
154+
"OGChipSelectEditMenu": "Orion\tON Semiconductor NCS36510"
152155
}
153156
}

0 commit comments

Comments
 (0)