michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: improve arch error message for invalid arch selection

Browse Source 
Legacy hw model picked the arch based on folder names.
The new hw model allows for greater flexibility and instead uses the
architecture defined by `CONFIG_ARCH` in Kconfig.

Therefore check that ARCH is defined and fail with a better error
message if ARCH is not defined. The error message includes the board and
SoC selected to make it easier to trace such errors.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen
2024-02-07 16:29:01 +01:00
committed by Carles Cufi
parent c47c37d3db
commit 2f1e33a2e6
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/modules/arch_v2.cmake
View File

@@ -31,8 +31,15 @@ if(HWMv2)
# (read: multi-core and multi-arch SoC).
set(ARCH ${CONFIG_ARCH})
string(TOUPPER "${ARCH}" arch_upper)
cmake_path(GET ARCH_V2_${arch_upper}_DIR PARENT_PATH ARCH_DIR)
if(NOT ARCH)
message(FATAL_ERROR "ARCH not defined. Check that BOARD=${BOARD}, is selecting "
"an appropriate SoC in Kconfig, SoC=${CONFIG_SOC}, and that the SoC "
"is selecting the correct architecture."
)
endif()
cmake_path(GET ARCH_V2_${arch_upper}_DIR PARENT_PATH ARCH_DIR)
if(NOT ARCH_DIR)
message(FATAL_ERROR "Could not find ARCH=${ARCH} for BOARD=${BOARD}, \
please check your installation. ARCH roots searched: \n\