Skip to content

Commit 7c9b958

Browse files
nordicjmArekBalysNordic
authored andcommitted
[nrf noup] config: Add support for non-PM factory data generation
fixup! [nrf noup] config: Add initial sysbuild files Adds support for factory data generation using devicetree data from the primary sysbuild image, if partition manager is not enabled for a build Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 93c712e) Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent 3b3d9ec commit 7c9b958

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake

+7-12
Original file line numberDiff line numberDiff line change
@@ -163,21 +163,16 @@ function(nrfconnect_create_factory_data factory_data_target script_path schema_p
163163
string(APPEND script_args "--offset $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_ADDRESS>\n")
164164
string(APPEND script_args "--size $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_OFFSET>\n")
165165
else()
166-
include(${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/dts.cmake)
167-
168-
get_target_property(factory_data_alias devicetree_target "DT_ALIAS|factory-data")
169-
get_target_property(factory_data_address devicetree_target "DT_REG|${factory_data_alias}|ADDR")
170-
get_target_property(factory_data_size devicetree_target "DT_REG|${factory_data_alias}|SIZE")
171-
172-
# remove ; from address and size properties
173-
string(SUBSTRING ${factory_data_address} 0 -1 factory_data_address)
174-
string(SUBSTRING ${factory_data_size} 0 -1 factory_data_size)
175-
if(NOT (DEFINED factory_data_alias AND DEFINED factory_data_address AND DEFINED factory_data_size))
176-
message(FATAL_ERROR "factory-data alias does not exist in DTS")
177-
endif()
166+
include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/suit_utilities.cmake)
178167

168+
sysbuild_dt_alias(factory_data_alias IMAGE ${DEFAULT_IMAGE} PROPERTY "factory-data")
169+
sysbuild_dt_reg_addr(factory_data_address IMAGE ${DEFAULT_IMAGE} PATH "${factory_data_alias}")
170+
sysbuild_dt_reg_size(factory_data_size IMAGE ${DEFAULT_IMAGE} PATH "${factory_data_alias}")
179171
string(APPEND script_args "--offset ${factory_data_address}\n")
180172
string(APPEND script_args "--size ${factory_data_size}\n")
173+
suit_add_merge_hex_file(FILES ${factory_data_output_path}.hex
174+
DEPENDENCIES ${factory_data_target}
175+
)
181176
endif()
182177

183178
# Execute first script to create a JSON file

0 commit comments

Comments
 (0)