[nrf noup] cmake: Kconfig: strict mode

fail building uppon ineffective Kconfigs

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>

Author: michalek-no

cmake/modules/kconfig.cmake

@@ -20,6 +20,8 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/kconfig/include/config)
 
 set_ifndef(KCONFIG_NAMESPACE "CONFIG")
 
+set_ifndef(KCONFIG_STRICT_USER_CONFIG ON)
+
 set_ifndef(KCONFIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Kconfig)
 set(KCONFIG_BOARD_DIR ${KCONFIG_BINARY_DIR}/boards)
 file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR})
@@ -328,6 +330,21 @@ foreach(f ${merge_config_files})
 endforeach()
 set(merge_config_files ${merge_config_files_with_absolute_paths})
 
+# User-provided configuration fragments (prj.conf, sysbuild.conf, CLI, etc.)
+# used for strict assignment checking. Board/shield defaults are excluded.
+set(KCONFIG_USER_CONFIG_FILES "")
+foreach(user_conf IN LISTS CONF_FILE_AS_LIST EXTRA_CONF_FILE_AS_LIST config_files)
+  if(IS_ABSOLUTE ${user_conf})
+    set(user_conf_path ${user_conf})
+  else()
+    set(user_conf_path ${APPLICATION_CONFIG_DIR}/${user_conf})
+  endif()
+  list(APPEND KCONFIG_USER_CONFIG_FILES ${user_conf_path})
+endforeach()
+if(EXTRA_KCONFIG_OPTIONS_FILE)
+  list(APPEND KCONFIG_USER_CONFIG_FILES ${EXTRA_KCONFIG_OPTIONS_FILE})
+endif()
+
 foreach(f ${merge_config_files})
   if(NOT EXISTS ${f} OR IS_DIRECTORY ${f})
     message(FATAL_ERROR "File not found: ${f}")
@@ -397,6 +414,28 @@ if(DEFINED FORCED_CONF_FILE)
   list(APPEND input_configs_flags --forced-input-configs)
 endif()
 
+set(kconfig_strict_args)
+set(kconfig_strict_user_config_files "")
+zephyr_get(KCONFIG_STRICT_USER_CONFIG SYSBUILD GLOBAL)
+if(KCONFIG_STRICT_USER_CONFIG)
+  list(APPEND kconfig_strict_user_config_files ${KCONFIG_USER_CONFIG_FILES})
+elseif(EXTRA_KCONFIG_OPTIONS_FILE AND EXISTS ${EXTRA_KCONFIG_OPTIONS_FILE})
+  file(READ ${EXTRA_KCONFIG_OPTIONS_FILE} extra_kconfig_options_content)
+  string(STRIP "${extra_kconfig_options_content}" extra_kconfig_options_content)
+  if(extra_kconfig_options_content)
+    set(KCONFIG_STRICT_USER_CONFIG ON)
+    list(APPEND kconfig_strict_user_config_files ${EXTRA_KCONFIG_OPTIONS_FILE})
+  endif()
+endif()
+if(KCONFIG_STRICT_USER_CONFIG)
+  list(APPEND kconfig_strict_args --strict-user-configs)
+  foreach(user_conf ${kconfig_strict_user_config_files})
+    if(EXISTS ${user_conf})
+      list(APPEND kconfig_strict_args --user-config-files ${user_conf})
+    endif()
+  endforeach()
+endif()
+
 cmake_path(GET AUTOCONF_H PARENT_PATH autoconf_h_path)
 if(NOT EXISTS ${autoconf_h_path})
   file(MAKE_DIRECTORY ${autoconf_h_path})
@@ -410,6 +449,7 @@ execute_process(
   ${ZEPHYR_BASE}/scripts/kconfig/kconfig.py
   --zephyr-base=${ZEPHYR_BASE}
   ${input_configs_flags}
+  ${kconfig_strict_args}
   ${KCONFIG_ROOT}
   ${DOTCONFIG}
   ${AUTOCONF_H}

samples/drivers/firmware/scmi/prj.conf

@@ -1,2 +1,2 @@
-CONFIG_ARM_SCMI_SHELL=y
+CONFIG_ARM_SCMI_SHELL=n
 CONFIG_BOOT_BANNER=n

samples/net/ethernet/gptp/boards/native_sim.conf

@@ -2,7 +2,7 @@
 CONFIG_ETH_NATIVE_TAP_PTP_CLOCK=y
 
 #CONFIG_ETH_NATIVE_TAP_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_TAP_MAC_ADDR="00:00:5e:00:53:2a"
+# CONFIG_ETH_NATIVE_TAP_MAC_ADDR is not set
 
 # Assume 1 ms accuracy for native_sim simulated clock
 CONFIG_NET_GPTP_CLOCK_ACCURACY_1MS=y

samples/net/ocpp/prj.conf

@@ -33,7 +33,7 @@ CONFIG_PICOLIBC=y
 CONFIG_NET_ARP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y
-CONFIG_NET_DHCPV4_OPTION_CALLBACKS=y
+CONFIG_NET_DHCPV4_OPTION_CALLBACKS=n
 CONFIG_TEST_RANDOM_GENERATOR=y
 
 CONFIG_NET_TX_STACK_SIZE=2048

samples/net/ptp/boards/native_sim.conf

@@ -2,7 +2,7 @@
 CONFIG_ETH_NATIVE_TAP_PTP_CLOCK=y
 
 #CONFIG_ETH_NATIVE_TAP_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_TAP_MAC_ADDR="00:00:5e:00:53:2a"
+# CONFIG_ETH_NATIVE_TAP_MAC_ADDR is not set
 
 # Assume 1 ms accuracy for native_sim simulated clock
 CONFIG_PTP_CLOCK_ACCURACY_1MS=y

samples/net/sockets/coap_server/prj.conf

@@ -41,13 +41,13 @@ CONFIG_NET_MGMT_EVENT_INFO=y
 # IPv6 Support
 CONFIG_NET_IPV6=y
 CONFIG_NET_CONFIG_NEED_IPV6=y
-CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
-CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
+# CONFIG_NET_CONFIG_MY_IPV6_ADDR is not set
+# CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT is not set
 
 #IPv4 Support
 CONFIG_NET_IPV4=n
 CONFIG_NET_CONFIG_NEED_IPV4=n
-CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
+# CONFIG_NET_CONFIG_MY_IPV4_ADDR is not set
 
 # Enable v4-mapped-on-v6
-CONFIG_NET_IPV4_MAPPING_TO_IPV6=y
+CONFIG_NET_IPV4_MAPPING_TO_IPV6=n

samples/net/sockets/echo_server/overlay-ws-console.conf

@@ -6,6 +6,6 @@ CONFIG_EVENTFD=y
 CONFIG_POSIX_API=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
 CONFIG_NET_MAX_CONN=32
-CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=32
+# CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS is not set
 CONFIG_ZVFS_EVENTFD_MAX=10
 CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE=24

samples/net/stats/prj.conf

@@ -45,4 +45,4 @@ CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 
 # Logging
 CONFIG_LOG=y
-CONFIG_LOG_BUFFER_SIZE=4096
+# CONFIG_LOG_BUFFER_SIZE is not set

samples/net/syslog_net/prj.conf

@@ -9,8 +9,8 @@ CONFIG_NET_BUF_RX_COUNT=32
 CONFIG_NET_BUF_TX_COUNT=32
 CONFIG_NET_SOCKETS=y
 
-CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
-CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
+# CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT is not set
+# CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT is not set
 
 CONFIG_NET_LOG=y
 CONFIG_LOG=y

samples/net/zperf/prj.conf

@@ -39,9 +39,9 @@ CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 CONFIG_LOG=y
 CONFIG_SHELL_CMDS_RESIZE=n
 
-CONFIG_CACHE_MANAGEMENT=y
+CONFIG_CACHE_MANAGEMENT=n
 CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_TIMESLICING=n
 
 # For speed optimizations
-CONFIG_PICOLIBC_USE_MODULE=y
+CONFIG_PICOLIBC_USE_MODULE=n