Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/modules/configuration_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# - EXTRA_DTC_OVERLAY_FILE List of additional devicetree overlay files
# - DTS_EXTRA_CPPFLAGS List of additional devicetree preprocessor defines
# - APPLICATION_CONFIG_DIR: Root folder for application configuration
# - NET_INIT_CONFIG_FILE: Name of the network init configuration file
#
# If any of the above variables are already set when this CMake module is
# loaded, then no changes to the variable will happen.
Expand Down Expand Up @@ -95,5 +96,6 @@ zephyr_boilerplate_watch(DTC_OVERLAY_FILE)
zephyr_get(EXTRA_CONF_FILE SYSBUILD LOCAL VAR EXTRA_CONF_FILE OVERLAY_CONFIG MERGE REVERSE)
zephyr_get(EXTRA_DTC_OVERLAY_FILE SYSBUILD LOCAL MERGE REVERSE)
zephyr_get(DTS_EXTRA_CPPFLAGS SYSBUILD LOCAL MERGE REVERSE)
zephyr_get(NET_INIT_CONFIG_FILE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be using SYSBUILD LOCAL flags

build_info(application source-dir VALUE ${APPLICATION_SOURCE_DIR})
build_info(application configuration-dir VALUE ${APPLICATION_CONFIG_DIR})
7 changes: 5 additions & 2 deletions cmake/modules/kernel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,11 @@ if(CONFIG_NET_CONFIG_SETTINGS)
# If network configuration library is enabled, check if the yaml file
# is present and use it to generate an initial configuration. Otherwise
# use the .config file to generate the initial configuration.
if(EXISTS ${APPLICATION_SOURCE_DIR}/network-config.yaml)
network_generate_config_file_for_target(app ${APPLICATION_SOURCE_DIR}/network-config.yaml)
if(NOT NET_CONFIG_FILE)
set(NET_CONFIG_FILE ${APPLICATION_SOURCE_DIR}/network-config.yaml)
endif()
if(EXISTS ${NET_CONFIG_FILE})
network_generate_config_file_for_target(app ${NET_CONFIG_FILE})
else()
network_generate_config_file_for_target(app ${DOTCONFIG})
endif()
Expand Down