Skip to content

Commit e6c51fd

Browse files
committed
Revert "[nrf fromtree] cmake: support build info in Zephyr"
This reverts commit 94604d6.
1 parent 4fea8df commit e6c51fd

File tree

7 files changed

+0
-32
lines changed

7 files changed

+0
-32
lines changed

CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2232,10 +2232,3 @@ add_subdirectory_ifdef(
22322232
CONFIG_MAKEFILE_EXPORTS
22332233
cmake/makefile_exports
22342234
)
2235-
2236-
yaml_context(EXISTS NAME build_info result)
2237-
if(result)
2238-
build_info(zephyr version VALUE ${PROJECT_VERSION_STR})
2239-
build_info(zephyr zephyr-base VALUE ${ZEPHYR_BASE})
2240-
yaml_save(NAME build_info)
2241-
endif()

cmake/modules/FindHostTools.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,3 @@ set_ifndef(TOOLCHAIN_KCONFIG_DIR ${TOOLCHAIN_ROOT}/cmake/toolchain/${ZEPHYR_TOOL
114114

115115
set(HostTools_FOUND TRUE)
116116
set(HOSTTOOLS_FOUND TRUE)
117-
build_info(toolchain name VALUE ${ZEPHYR_TOOLCHAIN_VARIANT})
118-
string(TOUPPER ${ZEPHYR_TOOLCHAIN_VARIANT} zephyr_toolchain_variant_upper)
119-
build_info(toolchain path VALUE "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")

cmake/modules/boards.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,3 @@ if(BOARD_EXTENSIONS)
353353
list(APPEND BOARD_EXTENSION_DIRS ${board_extension_dir})
354354
endforeach()
355355
endif()
356-
build_info(board name VALUE ${BOARD})
357-
string(REGEX REPLACE "^/" "" qualifiers "${BOARD_QUALIFIERS}")
358-
build_info(board qualifiers VALUE ${qualifiers})
359-
build_info(board revision VALUE ${BOARD_REVISION})

cmake/modules/configuration_files.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,3 @@ zephyr_boilerplate_watch(DTC_OVERLAY_FILE)
9999
zephyr_get(EXTRA_CONF_FILE SYSBUILD LOCAL VAR EXTRA_CONF_FILE OVERLAY_CONFIG MERGE REVERSE)
100100
zephyr_get(EXTRA_DTC_OVERLAY_FILE SYSBUILD LOCAL MERGE REVERSE)
101101
zephyr_get(DTS_EXTRA_CPPFLAGS SYSBUILD LOCAL MERGE REVERSE)
102-
build_info(application source-dir VALUE ${APPLICATION_SOURCE_DIR})
103-
build_info(application configuration-dir VALUE ${APPLICATION_CONFIG_DIR})

cmake/modules/dts.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ set(dts_files
182182
if(DTC_OVERLAY_FILE)
183183
zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS
184184
OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)
185-
build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})
186185
list(APPEND
187186
dts_files
188187
${DTC_OVERLAY_FILE_AS_LIST}
@@ -192,7 +191,6 @@ endif()
192191
if(EXTRA_DTC_OVERLAY_FILE)
193192
zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS
194193
OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)
195-
build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
196194
list(APPEND
197195
dts_files
198196
${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -398,7 +396,3 @@ elseif(stderr)
398396
message(WARNING "dtc raised one or more warnings:\n${stderr}")
399397
endif()
400398
endif(DTC)
401-
402-
build_info(devicetree files VALUE ${dts_files})
403-
build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
404-
build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})

cmake/modules/kconfig.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,11 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
9898
if(CONF_FILE)
9999
string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
100100
string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")
101-
build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})
102101
endif()
103102

104103
if(EXTRA_CONF_FILE)
105104
string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)
106105
string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
107-
build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})
108106
endif()
109107

110108
zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -360,7 +358,6 @@ endif()
360358
if(CREATE_NEW_DOTCONFIG)
361359
set(input_configs_flags --handwritten-input-configs)
362360
set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})
363-
build_info(kconfig files VALUE ${input_configs})
364361
else()
365362
set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})
366363
endif()

share/sysbuild/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,3 @@ if(EXISTS ${APP_DIR}/sysbuild/CMakeLists.txt)
2525
else()
2626
add_subdirectory(template _sysbuild)
2727
endif()
28-
29-
build_info(sysbuild VALUE true)
30-
build_info(application source-dir VALUE ${CMAKE_CURRENT_SOURCE_DIR})
31-
yaml_context(EXISTS NAME build_info result)
32-
if(result)
33-
yaml_save(NAME build_info)
34-
endif()

0 commit comments

Comments
 (0)