Skip to content

Commit 973de90

Browse files
spcaipers-armspcaipers-arm
authored
[projmgr] Fix $Bname$ access sequence expansion
1 parent 781d198 commit 973de90

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

‎tools/projmgr/src/ProjMgrWorker.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2695,10 +2695,12 @@ bool ProjMgrWorker::ProcessPrecedences(ContextItem& context, bool processDevice,
26952695

26962696
// set context variables (static access sequences)
26972697
DeviceItem deviceItem;
2698+
BoardItem boardItem;
26982699
GetDeviceItem(context.device, deviceItem);
2700+
GetBoardItem(context.board, boardItem);
26992701
context.variables[RteConstants::AS_DNAME] = deviceItem.name;
27002702
context.variables[RteConstants::AS_PNAME] = deviceItem.pname;
2701-
context.variables[RteConstants::AS_BNAME] = context.board;
2703+
context.variables[RteConstants::AS_BNAME] = boardItem.name;
27022704
context.variables[RteConstants::AS_COMPILER] = context.toolchain.name;
27032705

27042706
// Add cdefault misc into csolution

‎tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Debug+CM0.cprj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<compiler name="AC6" version="6.18.0"/>
1515
</compilers>
1616

17-
<target Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dvendor="ARM:82">
17+
<target Bname="RteTest Test board-3" Brevision="1.1.1" Bvendor="Keil" Bversion="1.1.1" Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dvendor="ARM:82">
1818
<output elf="test-access-sequences1.axf" intdir="tmp/test-access-sequences1/CM0/Debug" name="test-access-sequences1" outdir="out/test-access-sequences1/CM0/Debug" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
1919
<cflags add="-O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
2020
<cxxflags add="-O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
21-
<ldflags compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_ARMCM0.h"/>
22-
<defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2.axf;DEF2-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2.axf;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.axf;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-</defines>
21+
<ldflags compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_Test_board-3.h"/>
22+
<defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2.axf;DEF2-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2.axf;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.axf;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-RteTest Test board-3</defines>
2323
<includes>../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
2424
</target>
2525

‎tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Release+CM0.cprj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<compiler name="AC6" version="6.18.0"/>
1515
</compilers>
1616

17-
<target Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dvendor="ARM:82">
17+
<target Bname="RteTest Test board-3" Brevision="1.1.1" Bvendor="Keil" Bversion="1.1.1" Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dvendor="ARM:82">
1818
<output elf="test-access-sequences1.axf" intdir="tmp/test-access-sequences1/CM0/Release" name="test-access-sequences1" outdir="out/test-access-sequences1/CM0/Release" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
1919
<cflags add="-O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
2020
<cxxflags add="-O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
21-
<ldflags add="--list=./out/test-access-sequences1/CM0/Release/test-access-sequences1.map" compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_ARMCM0.h"/>
22-
<defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2.axf;DEF2-PROJ1-out/test-access-sequences2/CM3/Release/test-access-sequences2.axf;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.axf;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-</defines>
21+
<ldflags add="--list=./out/test-access-sequences1/CM0/Release/test-access-sequences1.map" compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_Test_board-3.h"/>
22+
<defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2.axf;DEF2-PROJ1-out/test-access-sequences2/CM3/Release/test-access-sequences2.axf;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.axf;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-RteTest Test board-3</defines>
2323
<includes>../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
2424
</target>
2525

‎tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Debug+CM0.cprj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<compiler name="AC6" version="6.18.0"/>
1515
</compilers>
1616

17-
<target Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dsecure="Secure" Dvendor="ARM:82">
17+
<target Bname="RteTest Test board-3" Brevision="1.1.1" Bvendor="Keil" Bversion="1.1.1" Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dsecure="Secure" Dvendor="ARM:82">
1818
<output cmse-lib="test-access-sequences2_CMSE_Lib.o" elf="test-access-sequences2.axf" intdir="tmp/test-access-sequences2/CM0/Debug" name="test-access-sequences2" outdir="out/test-access-sequences2/CM0/Debug" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
19-
<cflags add="PROJ2-D(RteTest_ARMCM0)-B() -O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
20-
<cxxflags add="PROJ2-D(RteTest_ARMCM0)-B() -O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
21-
<ldflags compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_ARMCM0.h"/>
22-
<defines>out/test-access-sequences1/CM0/Debug/test-access-sequences1.axf;DEF-CM0-RteTest_ARMCM0-</defines>
19+
<cflags add="PROJ2-D(RteTest_ARMCM0)-B(RteTest Test board-3) -O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
20+
<cxxflags add="PROJ2-D(RteTest_ARMCM0)-B(RteTest Test board-3) -O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
21+
<ldflags compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_Test_board-3.h"/>
22+
<defines>out/test-access-sequences1/CM0/Debug/test-access-sequences1.axf;DEF-CM0-RteTest_ARMCM0-RteTest Test board-3</defines>
2323
<includes>out/test-access-sequences1/CM0/Debug/test-access-sequences1.axf;../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
2424
</target>
2525

‎tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Release+CM0.cprj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<compiler name="AC6" version="6.18.0"/>
1515
</compilers>
1616

17-
<target Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dsecure="Secure" Dvendor="ARM:82">
17+
<target Bname="RteTest Test board-3" Brevision="1.1.1" Bvendor="Keil" Bversion="1.1.1" Dfpu="NO_FPU" Dname="RteTest_ARMCM0" Dsecure="Secure" Dvendor="ARM:82">
1818
<output cmse-lib="test-access-sequences2_CMSE_Lib.o" elf="test-access-sequences2.axf" intdir="tmp/test-access-sequences2/CM0/Release" name="test-access-sequences2" outdir="out/test-access-sequences2/CM0/Release" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
19-
<cflags add="PROJ2-D(RteTest_ARMCM0)-B() -O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
20-
<cxxflags add="PROJ2-D(RteTest_ARMCM0)-B() -O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
21-
<ldflags add="--list=./out/test-access-sequences2/CM0/Release/test-access-sequences2.map" compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_ARMCM0.h"/>
22-
<defines>out/test-access-sequences1/CM0/Release/test-access-sequences1.axf;DEF-CM0-RteTest_ARMCM0-</defines>
19+
<cflags add="PROJ2-D(RteTest_ARMCM0)-B(RteTest Test board-3) -O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
20+
<cxxflags add="PROJ2-D(RteTest_ARMCM0)-B(RteTest Test board-3) -O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
21+
<ldflags add="--list=./out/test-access-sequences2/CM0/Release/test-access-sequences2.map" compiler="AC6" file="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/ac6_linker_script.sct.src" regions="../data/TestAccessSequences/RTE/Device/RteTest_ARMCM0/regions_RteTest_Test_board-3.h"/>
22+
<defines>out/test-access-sequences1/CM0/Release/test-access-sequences1.axf;DEF-CM0-RteTest_ARMCM0-RteTest Test board-3</defines>
2323
<includes>out/test-access-sequences1/CM0/Release/test-access-sequences1.axf;../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
2424
</target>
2525

‎tools/projmgr/test/data/TestAccessSequences/test-access-sequences.csolution.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ solution:
44
target-types:
55
- type: CM0
66
device: RteTest_ARMCM0
7+
board: Keil::RteTest Test board-3
78
misc:
89
- for-compiler: AC6
910
C-CPP: [-C-CPP-$Dname$]

0 commit comments

Comments
 (0)