Skip to content

Commit e7da853

Browse files
author
Sean Lyons
committed
BLEstack projects building in IAR
1 parent 7b5d33c commit e7da853

File tree

13 files changed

+366
-262
lines changed

13 files changed

+366
-262
lines changed

‎examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/central_bidirectional_audio/tirtos/iar/app/cc26x2r1lp_app.ewp‎

Lines changed: 49 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<name>General</name>
1212
<archiveVersion>3</archiveVersion>
1313
<data>
14-
<version>29</version>
14+
<version>30</version>
1515
<wantNonLocal>1</wantNonLocal>
1616
<debug>1</debug>
1717
<option>
@@ -66,7 +66,7 @@
6666
</option>
6767
<option>
6868
<name>OGLastSavedByProductVersion</name>
69-
<state>8.11.4.14241</state>
69+
<state>8.20.2.14834</state>
7070
</option>
7171
<option>
7272
<name>GeneralEnableMisra</name>
@@ -116,7 +116,7 @@
116116
</option>
117117
<option>
118118
<name>GBECoreSlave</name>
119-
<version>25</version>
119+
<version>26</version>
120120
<state>39</state>
121121
</option>
122122
<option>
@@ -133,7 +133,7 @@
133133
</option>
134134
<option>
135135
<name>CoreVariant</name>
136-
<version>25</version>
136+
<version>26</version>
137137
<state>39</state>
138138
</option>
139139
<option>
@@ -156,7 +156,7 @@
156156
</option>
157157
<option>
158158
<name>GFPUCoreSlave2</name>
159-
<version>25</version>
159+
<version>26</version>
160160
<state>39</state>
161161
</option>
162162
<option>
@@ -200,6 +200,10 @@
200200
<name>DSPExtension</name>
201201
<state>1</state>
202202
</option>
203+
<option>
204+
<name>TrustZone</name>
205+
<state>0</state>
206+
</option>
203207
</data>
204208
</settings>
205209
<settings>
@@ -360,7 +364,9 @@
360364
<state>$SRC_BLE_DIR$\osal\src\inc</state>
361365
<state>$SRC_BLE_DIR$\services\src\saddr</state>
362366
<state>$SRC_BLE_DIR$\services\src\sdata</state>
363-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2</state>
367+
<state>$SRC_BLE_DIR$\services\src\nv</state>
368+
<state>$SRC_BLE_DIR$\services\src\nv\cc26xx</state>
369+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2_v1</state>
364370
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source</state>
365371
</option>
366372
<option>
@@ -749,7 +755,8 @@
749755
<option>
750756
<name>IlinkConfigDefines</name>
751757
<state>CC2642=1</state>
752-
<state>FLASH_ROM_BUILD=1</state>
758+
<state>FLASH_ONLY_BUILD=1</state>
759+
<state>ENCRYPTION_ROM=1</state>
753760
<state>PAGE_ALIGN=1</state>
754761
</option>
755762
<option>
@@ -832,15 +839,13 @@
832839
</option>
833840
<option>
834841
<name>IlinkAdditionalLibs</name>
835-
<state>$PROJ_DIR$\..\config\ble_r2.symbols</state>
836-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2\driverlib\bin\iar\driverlib.lib</state>
837-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\kernel\tirtos\packages\ti\dpl\lib\dpl_cc26x2.arm4f</state>
838-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\lib\drivers_cc26x2.arm4f</state>
839-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\rf\lib\rf_multiMode_cc26x2.arm4f</state>
842+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2_v1\driverlib\bin\iar\driverlib.lib</state>
843+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\kernel\tirtos\packages\ti\dpl\lib\dpl_cc26x2_v1.arm4f</state>
844+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\lib\drivers_cc26x2_v1.arm4f</state>
845+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\rf\lib\rf_multiMode_cc26x2_v1.arm4f</state>
840846
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\display\lib\display.arm4f</state>
841-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\mw\lcd\lib\lcd.arm4f</state>
842-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\grlib\lib\grlib.arm4f</state>
843-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\pdm\lib\pdm_cc26x2.arm4f</state>
847+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\grlib\lib\iar\m4f\grlib.a</state>
848+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\pdm\lib\pdm_cc26x2_v1.arm4f</state>
844849
<state>$SRC_LOCAL_DIR$/source/third_party/sbc/bin/iar/cc26xx_mSBC_library.a</state>
845850
</option>
846851
<option>
@@ -1063,7 +1068,7 @@
10631068
<name>General</name>
10641069
<archiveVersion>3</archiveVersion>
10651070
<data>
1066-
<version>29</version>
1071+
<version>30</version>
10671072
<wantNonLocal>1</wantNonLocal>
10681073
<debug>1</debug>
10691074
<option>
@@ -1118,7 +1123,7 @@
11181123
</option>
11191124
<option>
11201125
<name>OGLastSavedByProductVersion</name>
1121-
<state>8.11.4.14241</state>
1126+
<state>8.20.2.14834</state>
11221127
</option>
11231128
<option>
11241129
<name>GeneralEnableMisra</name>
@@ -1168,7 +1173,7 @@
11681173
</option>
11691174
<option>
11701175
<name>GBECoreSlave</name>
1171-
<version>25</version>
1176+
<version>26</version>
11721177
<state>39</state>
11731178
</option>
11741179
<option>
@@ -1185,7 +1190,7 @@
11851190
</option>
11861191
<option>
11871192
<name>CoreVariant</name>
1188-
<version>25</version>
1193+
<version>26</version>
11891194
<state>39</state>
11901195
</option>
11911196
<option>
@@ -1208,7 +1213,7 @@
12081213
</option>
12091214
<option>
12101215
<name>GFPUCoreSlave2</name>
1211-
<version>25</version>
1216+
<version>26</version>
12121217
<state>39</state>
12131218
</option>
12141219
<option>
@@ -1252,6 +1257,10 @@
12521257
<name>DSPExtension</name>
12531258
<state>1</state>
12541259
</option>
1260+
<option>
1261+
<name>TrustZone</name>
1262+
<state>0</state>
1263+
</option>
12551264
</data>
12561265
</settings>
12571266
<settings>
@@ -1412,7 +1421,9 @@
14121421
<state>$SRC_BLE_DIR$\osal\src\inc</state>
14131422
<state>$SRC_BLE_DIR$\services\src\saddr</state>
14141423
<state>$SRC_BLE_DIR$\services\src\sdata</state>
1415-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2</state>
1424+
<state>$SRC_BLE_DIR$\services\src\nv</state>
1425+
<state>$SRC_BLE_DIR$\services\src\nv\cc26xx</state>
1426+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2_v1</state>
14161427
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source</state>
14171428
</option>
14181429
<option>
@@ -1801,7 +1812,8 @@
18011812
<option>
18021813
<name>IlinkConfigDefines</name>
18031814
<state>CC2642=1</state>
1804-
<state>FLASH_ROM_BUILD=1</state>
1815+
<state>FLASH_ONLY_BUILD=1</state>
1816+
<state>ENCRYPTION_ROM=1</state>
18051817
<state>PAGE_ALIGN=1</state>
18061818
</option>
18071819
<option>
@@ -1884,15 +1896,13 @@
18841896
</option>
18851897
<option>
18861898
<name>IlinkAdditionalLibs</name>
1887-
<state>$PROJ_DIR$\..\config\ble_r2.symbols</state>
1888-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2\driverlib\bin\iar\driverlib.lib</state>
1889-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\kernel\tirtos\packages\ti\dpl\lib\dpl_cc26x2.arm4f</state>
1890-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\lib\drivers_cc26x2.arm4f</state>
1891-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\rf\lib\rf_multiMode_cc26x2.arm4f</state>
1899+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2_v1\driverlib\bin\iar\driverlib.lib</state>
1900+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\kernel\tirtos\packages\ti\dpl\lib\dpl_cc26x2_v1.arm4f</state>
1901+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\lib\drivers_cc26x2_v1.arm4f</state>
1902+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\rf\lib\rf_multiMode_cc26x2_v1.arm4f</state>
18921903
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\display\lib\display.arm4f</state>
1893-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\mw\lcd\lib\lcd.arm4f</state>
1894-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\grlib\lib\grlib.arm4f</state>
1895-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\pdm\lib\pdm_cc26x2.arm4f</state>
1904+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\grlib\lib\iar\m4f\grlib.a</state>
1905+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\drivers\pdm\lib\pdm_cc26x2_v1.arm4f</state>
18961906
<state>$SRC_LOCAL_DIR$/source/third_party/sbc/bin/iar/cc26xx_mSBC_library.a</state>
18971907
</option>
18981908
<option>
@@ -2171,12 +2181,18 @@
21712181
<group>
21722182
<name>Drivers</name>
21732183
<group>
2174-
<name>ECC</name>
2184+
<name>NV</name>
2185+
<file>
2186+
<name>$SRC_BLE_DIR$\services\src\nv\cc26xx\crc.c</name>
2187+
</file>
2188+
<file>
2189+
<name>$SRC_BLE_DIR$\services\src\nv\cc26xx\crc.h</name>
2190+
</file>
21752191
<file>
2176-
<name>$SRC_BLE_DIR$\common\cc26xx\ecc\ECCROMCC26XX.c</name>
2192+
<name>$SRC_BLE_DIR$\services\src\nv\cc26xx\nvoctp.c</name>
21772193
</file>
21782194
<file>
2179-
<name>$SRC_BLE_DIR$\common\cc26xx\ecc\ECCROMCC26XX.h</name>
2195+
<name>$SRC_BLE_DIR$\services\src\nv\cc26xx\nvoctp.h</name>
21802196
</file>
21812197
</group>
21822198
<group>

‎examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/central_bidirectional_audio/tirtos/iar/ble5_central_bidirectional_audio.custom_argvars‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="iso-8859-1"?>
22

33
<iarUserArgVars>
4-
<group active="true" name="SIMPLELINK_CC2640R2_SDK">
4+
<group name="SIMPLELINK_CC2642R1_SDK" active="true">
55
<variable>
66
<name>SIMPLELINK_CORE_SDK_INSTALL_DIR</name>
77
<value>C:\ti\simplelink_cc26x2_sdk_2_10_00_44</value>
88
</variable>
99
<variable>
1010
<name>XDCROOT</name>
11-
<value>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\..\xdctools_3_50_04_43_core</value>
11+
<value>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\..\xdctools_3_50_05_12_core</value>
1212
</variable>
1313
<variable>
1414
<name>EXAMPLE_BLE_ROOT</name>

‎examples/rtos/CC26X2R1_LAUNCHXL/ble5apps/central_bidirectional_audio/tirtos/iar/stack/cc26x2r1lp_stack.ewp‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<name>General</name>
1212
<archiveVersion>3</archiveVersion>
1313
<data>
14-
<version>29</version>
14+
<version>30</version>
1515
<wantNonLocal>1</wantNonLocal>
1616
<debug>1</debug>
1717
<option>
@@ -66,7 +66,7 @@
6666
</option>
6767
<option>
6868
<name>OGLastSavedByProductVersion</name>
69-
<state>8.11.4.14241</state>
69+
<state>8.20.2.14834</state>
7070
</option>
7171
<option>
7272
<name>GeneralEnableMisra</name>
@@ -116,7 +116,7 @@
116116
</option>
117117
<option>
118118
<name>GBECoreSlave</name>
119-
<version>25</version>
119+
<version>26</version>
120120
<state>0</state>
121121
</option>
122122
<option>
@@ -133,7 +133,7 @@
133133
</option>
134134
<option>
135135
<name>CoreVariant</name>
136-
<version>25</version>
136+
<version>26</version>
137137
<state>0</state>
138138
</option>
139139
<option>
@@ -156,7 +156,7 @@
156156
</option>
157157
<option>
158158
<name>GFPUCoreSlave2</name>
159-
<version>25</version>
159+
<version>26</version>
160160
<state>0</state>
161161
</option>
162162
<option>
@@ -200,6 +200,10 @@
200200
<name>DSPExtension</name>
201201
<state>0</state>
202202
</option>
203+
<option>
204+
<name>TrustZone</name>
205+
<state>0</state>
206+
</option>
203207
</data>
204208
</settings>
205209
<settings>
@@ -363,9 +367,9 @@
363367
<state>$SRC_BLE_DIR$\services\src\nv\cc26xx</state>
364368
<state>$SRC_BLE_DIR$\services\src\saddr</state>
365369
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\kernel\tirtos\packages</state>
366-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2</state>
367-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2\rf_patches</state>
368-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\cc13x2_cc26x2\inc</state>
370+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2_v1</state>
371+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc13x2_cc26x2_v1\rf_patches</state>
372+
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\cc13x2_cc26x2_v1\inc</state>
369373
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source</state>
370374
<state>$XDCROOT$\packages</state>
371375
</option>
@@ -783,11 +787,11 @@
783787
</option>
784788
<option>
785789
<name>IlinkIcfOverride</name>
786-
<state>1</state>
790+
<state>0</state>
787791
</option>
788792
<option>
789793
<name>IlinkIcfFile</name>
790-
<state>$SRC_BLE_DIR$\common\cc26xx\iar\cc26xx_stack.icf</state>
794+
<state/>
791795
</option>
792796
<option>
793797
<name>IlinkIcfFileSlave</name>
@@ -835,7 +839,7 @@
835839
</option>
836840
<option>
837841
<name>IlinkAdditionalLibs</name>
838-
<state>$SIMPLELINK_CORE_SDK_INSTALL_DIR$\source\ti\devices\cc26x0r2\driverlib\bin\iar\driverlib.lib</state>
842+
<state/>
839843
</option>
840844
<option>
841845
<name>IlinkOverrideProgramEntryLabel</name>
@@ -1246,12 +1250,21 @@
12461250
<name>ROM</name>
12471251
<file>
12481252
<name>$SRC_BLE_DIR$\rom\r2\common_rom_init.c</name>
1253+
<excluded>
1254+
<configuration>FlashROM_Library</configuration>
1255+
</excluded>
12491256
</file>
12501257
<file>
12511258
<name>$SRC_BLE_DIR$\rom\r2\rom_flash_jt.h</name>
1259+
<excluded>
1260+
<configuration>FlashROM_Library</configuration>
1261+
</excluded>
12521262
</file>
12531263
<file>
12541264
<name>$SRC_BLE_DIR$\rom\r2\rom_init.c</name>
1265+
<excluded>
1266+
<configuration>FlashROM_Library</configuration>
1267+
</excluded>
12551268
</file>
12561269
</group>
12571270
<group>
@@ -1280,9 +1293,6 @@
12801293
<file>
12811294
<name>$PROJ_DIR$\..\..\build_config.opt</name>
12821295
</file>
1283-
<file>
1284-
<name>$SRC_BLE_DIR$\common\cc26xx\iar\cc26xx_stack_agama.icf</name>
1285-
</file>
12861296
<file>
12871297
<name>$SRC_BLE_DIR$\common\cc26xx\onboard.c</name>
12881298
</file>

0 commit comments

Comments
 (0)