Skip to content

Commit a028630

Browse files
brondanibrondani
authored
Merge branch 'Open-CMSIS-Pack:main' into main
2 parents 6f9f492 + 21980a0 commit a028630

116 files changed

Lines changed: 187 additions & 161 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/buildmgr.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ jobs:
308308
CI_CBUILD_INSTALLER: ${{ github.workspace }}/cbuild_install.sh
309309
CMSIS_PACK_ROOT: ${{ github.workspace }}/packs
310310
GCC_TOOLCHAIN_ROOT: ${{ github.workspace }}/${{ matrix.toolchain_root }}
311+
GCC_TOOLCHAIN_10_3_1: ${{ github.workspace }}/${{ matrix.toolchain_root }}
312+
AC6_TOOLCHAIN_6_18_0: ${{ github.workspace }}/${{ matrix.toolchain_root }}
311313
CI_ARCH: ${{ matrix.arch }}
312314
strategy:
313315
#fail-fast: true
@@ -460,6 +462,8 @@ jobs:
460462
lcov_installer: lcov-1.15.tar.gz
461463
CMSIS_PACK_ROOT: ${{ github.workspace }}/packs
462464
GCC_TOOLCHAIN_ROOT: ${{ github.workspace }}/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi/bin
465+
GCC_TOOLCHAIN_10_3_1: ${{ github.workspace }}/${{ matrix.toolchain_root }}
466+
AC6_TOOLCHAIN_6_18_0: ${{ github.workspace }}/${{ matrix.toolchain_root }}
463467
runs-on: ubuntu-22.04
464468
timeout-minutes: 15
465469
strategy:

‎tools/buildmgr/cbuild/src/CbuildModel.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,9 @@ bool CbuildModel::GetCompatibleToolchain(const string& name, const string& versi
473473
}
474474

475475
if (selectedVersion.empty()) {
476-
// no compatible registered toolchain was found, search for a suitable config file
477-
if (GetToolchainConfig(toolchainConfigFiles, name, versionRange)) {
478-
return true;
479-
}
476+
// no compatible registered toolchain was found
477+
LogMsg("M616", VAL("NAME", name));
478+
return false;
480479
} else {
481480
// registered toolchain was found
482481
m_toolchainRegisteredVersion = selectedVersion;

‎tools/buildmgr/cbuild/src/CbuildMsgs.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ void InitMessageTable()
8282
table["M613"] = MessageEntry(MsgLevel::LEVEL_ERROR, CRLF_B, "File '%PATH%' has unexpected format!" );
8383
table["M614"] = MessageEntry(MsgLevel::LEVEL_ERROR, CRLF_B, "Missing access sequence delimiter: '%ACCSEQDELIM%'!" );
8484
table["M615"] = MessageEntry(MsgLevel::LEVEL_ERROR, CRLF_B, "%PROP% '%VAL%' was not found in the loaded packs!" );
85+
table["M616"] = MessageEntry(MsgLevel::LEVEL_ERROR, CRLF_B, "compiler registration environment variable missing, format: %NAME%_TOOLCHAIN_<major>_<minor>_<patch>");
8586

8687
table["M630"] = MessageEntry(MsgLevel::LEVEL_WARNING, CRLF_B, "Device '%DEV%' is substituted with variant '%VAR%'." );
8788
table["M631"] = MessageEntry(MsgLevel::LEVEL_WARNING, CRLF_B, "Project must have exactly one target element!" );

‎tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
#
33
# - Applies to toolchain: ARM Compiler 6.16.2 and greater
44

5-
############### EDIT BELOW ###############
6-
# Set base directory of toolchain
7-
set(TOOLCHAIN_ROOT)
8-
set(TOOLCHAIN_VERSION "6.16.2")
9-
10-
############ DO NOT EDIT BELOW ###########
11-
125
set(AS "armasm")
136
set(CC "armclang")
147
set(CXX "armclang")
@@ -17,12 +10,8 @@ set(LD "armlink")
1710
set(AR "armar")
1811
set(OC "fromelf")
1912

20-
if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
21-
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
22-
endif()
23-
if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
24-
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
25-
endif()
13+
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
14+
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
2615

2716
if(DEFINED TOOLCHAIN_ROOT AND NOT TOOLCHAIN_ROOT STREQUAL "")
2817
set(EXT)

‎tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,14 @@
22
#
33
# - Applies to toolchain: LLVM/Clang Bare Metal Toolchain for the Arm Architecture 16.0.0 and greater
44

5-
############### EDIT BELOW ###############
6-
# Set base directory of toolchain
7-
set(TOOLCHAIN_ROOT)
8-
set(TOOLCHAIN_VERSION "17.0.1")
9-
10-
############ DO NOT EDIT BELOW ###########
11-
125
set(AS "clang")
136
set(CC "clang")
147
set(CXX "clang++")
158
set(CPP "clang")
169
set(OC "llvm-objcopy")
1710

18-
if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
19-
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
20-
endif()
21-
if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
22-
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
23-
endif()
11+
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
12+
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
2413

2514
if(DEFINED TOOLCHAIN_ROOT)
2615
set(PREFIX)

‎tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,14 @@
22
#
33
# - Applies to toolchain: GNU Toolchain for the Arm Architecture 10.3.1 and greater
44

5-
############### EDIT BELOW ###############
6-
# Set base directory of toolchain
7-
set(TOOLCHAIN_ROOT)
8-
set(TOOLCHAIN_VERSION "10.3.1")
9-
10-
############ DO NOT EDIT BELOW ###########
11-
125
set(AS "as")
136
set(CC "gcc")
147
set(CXX "g++")
158
set(CPP "gcc")
169
set(OC "objcopy")
1710

18-
if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
19-
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
20-
endif()
21-
if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
22-
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
23-
endif()
11+
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
12+
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
2413

2514
if(DEFINED TOOLCHAIN_ROOT)
2615
set(PREFIX arm-none-eabi-)

‎tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
# V1: Initial support
66
# V2: Support for 32-bit Cortex M,A and R
77

8-
############### EDIT BELOW ###############
9-
# Set base directory of toolchain
10-
set(TOOLCHAIN_ROOT)
11-
set(TOOLCHAIN_VERSION "9.32.1")
12-
13-
############ DO NOT EDIT BELOW ###########
14-
158
set(AS "iasmarm")
169
set(CC "iccarm")
1710
set(CXX "iccarm")
@@ -20,12 +13,8 @@ set(AR "iarchive")
2013
set(CPP "iccarm")
2114
set(OC "ielftool")
2215

23-
if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
24-
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
25-
endif()
26-
if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
27-
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
28-
endif()
16+
set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
17+
set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
2918

3019
if(DEFINED TOOLCHAIN_ROOT)
3120
set(EXT)

‎tools/buildmgr/test/testinput/Examples/AC6/ArmAsm/CMakeLists.txt.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ set(AS_ARM_SRC_FILES
3535

3636
# Toolchain config map
3737

38+
set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
39+
set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
3840
set(TOOLCHAIN_VERSION_MIN "6.0.0")
3941
set(TOOLCHAIN_VERSION_MAX "6.99.99")
4042
include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

‎tools/buildmgr/test/testinput/Examples/AC6/Asm/CMakeLists.txt.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ set(AS_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/AC6/Asm/AsmA
7878

7979
# Toolchain config map
8080

81+
set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
82+
set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
8183
set(TOOLCHAIN_VERSION_MIN "6.0.0")
8284
set(TOOLCHAIN_VERSION_MAX "6.99.99")
8385
include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

‎tools/buildmgr/test/testinput/Examples/AC6/BranchProtection/CMakeLists.txt.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ set(LIB_FILES
4848

4949
# Toolchain config map
5050

51+
set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
52+
set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
5153
set(TOOLCHAIN_VERSION_MIN "6.18.0")
5254
include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
5355
include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

0 commit comments

Comments
 (0)