cmake: BOARD_REVISION_CONFIG setting for Kconfig revision fragments
Fixes: #53696 Create a BOARD_REVISION_CONFIG setting to be consistent with the BOARD_DEFCONFIG setting. This allows systems which re-uses the Kconfig module to overrule the file to be used as BOARD_REVISION_CONFIG in same way as is done for the BOARD_DEFCONFIG file. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
parent
3b92034b57
commit
fe3efbc6a2
2 changed files with 8 additions and 3 deletions
|
@ -65,6 +65,9 @@ else()
|
|||
endif()
|
||||
|
||||
set_ifndef(BOARD_DEFCONFIG ${BOARD_DIR}/${BOARD}_defconfig)
|
||||
if((DEFINED BOARD_REVISION) AND EXISTS ${BOARD_DIR}/${BOARD}_${BOARD_REVISION_STRING}.conf)
|
||||
set_ifndef(BOARD_REVISION_CONFIG ${BOARD_DIR}/${BOARD}_${BOARD_REVISION_STRING}.conf)
|
||||
endif()
|
||||
set(DOTCONFIG ${PROJECT_BINARY_DIR}/.config)
|
||||
set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
|
||||
|
||||
|
@ -79,9 +82,6 @@ if(OVERLAY_CONFIG)
|
|||
string(REPLACE " " ";" OVERLAY_CONFIG_AS_LIST "${OVERLAY_CONFIG_EXPANDED}")
|
||||
endif()
|
||||
|
||||
if((DEFINED BOARD_REVISION) AND EXISTS ${BOARD_DIR}/${BOARD}_${BOARD_REVISION_STRING}.conf)
|
||||
list(INSERT CONF_FILE_AS_LIST 0 ${BOARD_DIR}/${BOARD}_${BOARD_REVISION_STRING}.conf)
|
||||
endif()
|
||||
|
||||
# DTS_ROOT_BINDINGS is a semicolon separated list, this causes
|
||||
# problems when invoking kconfig_target since semicolon is a special
|
||||
|
@ -238,6 +238,7 @@ list(SORT config_files)
|
|||
set(
|
||||
merge_config_files
|
||||
${BOARD_DEFCONFIG}
|
||||
${BOARD_REVISION_CONFIG}
|
||||
${CONF_FILE_AS_LIST}
|
||||
${shield_conf_files}
|
||||
${OVERLAY_CONFIG_AS_LIST}
|
||||
|
|
|
@ -50,6 +50,10 @@ set(KCONFIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
|
|||
set(AUTOCONF_H ${CMAKE_CURRENT_BINARY_DIR}/autoconf.h)
|
||||
set(CONF_FILE ${SB_CONF_FILE})
|
||||
set(BOARD_DEFCONFIG "${CMAKE_CURRENT_BINARY_DIR}/empty.conf")
|
||||
if(DEFINED BOARD_REVISION)
|
||||
set(BOARD_REVISION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/empty.conf")
|
||||
endif()
|
||||
|
||||
list(APPEND ZEPHYR_KCONFIG_MODULES_DIR BOARD=${BOARD})
|
||||
set(KCONFIG_NAMESPACE SB_CONFIG)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue