[nrf noup] Repair Factory data script after sysbuild

Factory data script must use the original configs instead of the
new ones created by sysbuild.

Author: ArekBalysNordic

config/nrfconnect/chip-module/Kconfig

@@ -87,7 +87,6 @@ config CHIP_OTA_REQUESTOR_REBOOT_ON_APPLY
 config CHIP_OTA_IMAGE_BUILD
 	bool
 	default y if CHIP_OTA_REQUESTOR
-	depends on SIGN_IMAGES
 	select DFU_MULTI_IMAGE_PACKAGE_BUILD
 
 config CHIP_EXAMPLE_DEVICE_INFO_PROVIDER

config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake

@@ -38,6 +38,8 @@
 #                         This argument is optional, if you don't want to verify the JSON file put it empty "".
 #   output_path         - a path to output directory, where created hex and JSON files will be stored.
 function(nrfconnect_create_factory_data factory_data_target script_path schema_path output_path image)
+  sysbuild_get(CONFIG_CHIP_FACTORY_DATA_BUILD IMAGE ${image} VAR CONFIG_CHIP_FACTORY_DATA_BUILD KCONFIG)
+  sysbuild_get(CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE IMAGE ${image} VAR CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE KCONFIG)
   sysbuild_get(CONFIG_CHIP_DEVICE_SERIAL_NUMBER IMAGE ${image} VAR CONFIG_CHIP_DEVICE_SERIAL_NUMBER KCONFIG)
   sysbuild_get(CONFIG_CHIP_DEVICE_MANUFACTURING_DATE IMAGE ${image} VAR CONFIG_CHIP_DEVICE_MANUFACTURING_DATE KCONFIG)
   sysbuild_get(CONFIG_CHIP_DEVICE_VENDOR_ID IMAGE ${image} VAR CONFIG_CHIP_DEVICE_VENDOR_ID KCONFIG)
@@ -219,7 +221,7 @@ function(nrfconnect_generate_factory_data)
                                  ${DEFAULT_IMAGE}
   )
 
-  if(SB_CONFIG_MATTER_FACTORY_DATA_MERGE_WITH_FIRMWARE)
+  if(CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE)
     if(SB_CONFIG_PARTITION_MANAGER)
       # Set custom target for merging factory_data hex file
       set_property(GLOBAL PROPERTY factory_data_PM_HEX_FILE ${OUTPUT_FILE_PATH}/factory_data.hex)