[nrf toup] Fix non-PM building of factory data

Fixes this feature to put files in the correct place and run
with the correct configuration

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

config/nrfconnect/chip-module/CMakeLists.txt

@@ -290,7 +290,7 @@ endif()
 # Define 'factory_data' target for generating a factory data partition
 # ==============================================================================
 
-if(CONFIG_CHIP_FACTORY_DATA_BUILD AND (NOT SYSBUILD OR NOT CONFIG_PARTITION_MANAGER_ENABLED))
+if(CONFIG_CHIP_FACTORY_DATA_BUILD AND CONFIG_PARTITION_MANAGER_ENABLED)
     nrfconnect_generate_factory_data()
 endif()
 

config/nrfconnect/chip-module/generate_factory_data.cmake

@@ -140,9 +140,9 @@ if(CONFIG_PARTITION_MANAGER_ENABLED)
     string(APPEND script_args "--offset $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_ADDRESS>\n")
     string(APPEND script_args "--size $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_OFFSET>\n")
 else()
-    dt_nodelabel(factory_data_partition_path NODELABEL "factory_data_partition" REQUIRED)
-    dt_reg_addr(factory_data_addr PATH ${factory_data_partition_path})
-    dt_reg_size(factory_data_size PATH ${factory_data_partition_path})
+    dt_nodelabel(factory_data_partition_path TARGET ${DEFAULT_IMAGE} NODELABEL "factory_data_partition" REQUIRED)
+    dt_reg_addr(factory_data_addr TARGET ${DEFAULT_IMAGE} PATH ${factory_data_partition_path})
+    dt_reg_size(factory_data_size TARGET ${DEFAULT_IMAGE} PATH ${factory_data_partition_path})
     string(APPEND script_args "--offset ${factory_data_addr}\n")
     string(APPEND script_args "--size ${factory_data_size}\n")     
 endif()
@@ -173,6 +173,10 @@ function(nrfconnect_generate_factory_data)
 find_package(Python3 REQUIRED)
 
 # CHIP_ROOT must be provided as a reference set all localization of scripts
+if(NOT CHIP_ROOT AND ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)
+  set(CHIP_ROOT ${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR})
+endif()
+
 if(NOT CHIP_ROOT)
 message(FATAL_ERROR "CHIP_ROOT variable is not set, please add it to CMakeLists.txt file")
 endif()
@@ -181,7 +185,14 @@ endif()
 set(FACTORY_DATA_SCRIPT_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py)
 set(GENERATE_CBOR_SCRIPT_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/nrfconnect_generate_partition.py)
 set(FACTORY_DATA_SCHEMA_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/nrfconnect_factory_data.schema)
-set(OUTPUT_FILE_PATH ${APPLICATION_BINARY_DIR}/zephyr)
+
+if(CONFIG_PARTITION_MANAGER_ENABLED)
+  set(OUTPUT_FILE_PATH ${APPLICATION_BINARY_DIR}/zephyr)
+else()
+  set(OUTPUT_FILE_PATH ${APPLICATION_BINARY_DIR})
+
+  import_kconfig("CONFIG" ${CMAKE_BINARY_DIR}/${DEFAULT_IMAGE}/zephyr/.config)
+endif()
 
 # create a .hex file with factory data in CBOR format based on the JSON file created previously 
 nrfconnect_create_factory_data(factory_data
@@ -194,9 +205,6 @@ if(CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE)
         # set custom target for merging factory_data hex file
         set_property(GLOBAL PROPERTY factory_data_PM_HEX_FILE ${OUTPUT_FILE_PATH}/factory_data.hex)
         set_property(GLOBAL PROPERTY factory_data_PM_TARGET factory_data)
-    else()
-        set_property(GLOBAL APPEND PROPERTY HEX_FILES_TO_MERGE ${OUTPUT_FILE_PATH}/factory_data.hex ${OUTPUT_FILE_PATH}/zephyr.hex)
-        set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${OUTPUT_FILE_PATH}/merged.hex)
     endif()
 endif()