samples: matter: Fix factory data generation

Fixed the factory data generation in all samples.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

docs/include/configuration/advanced/factory_data.txt

@@ -9,6 +9,6 @@ Factory data support
    To disable factory data support, set the following Kconfig options to ``n``:
 
    * :kconfig:option:`CONFIG_CHIP_FACTORY_DATA`
-   * :kconfig:option:`SB_CONFIG_MATTER_FACTORY_DATA_GENERATE`
+   * :kconfig:option:`SB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE`
 
    To learn more about factory data, read the :ref:`ug_matter_device_factory_provisioning` user guide.

docs/matter/end_product/factory_provisioning.rst

@@ -656,7 +656,7 @@ For example, the build command for the nRF52840 DK could look like this:
 
    $ west build -b nrf52840dk_nrf52840 -- \
    -DCONFIG_CHIP_FACTORY_DATA=y \
-   -DSB_CONFIG_MATTER_FACTORY_DATA_GENERATE=y \
+   -DSB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE=y \
    -DCONFIG_CHIP_FACTORY_DATA_GENERATE_ONBOARDING_CODES=y
 
 Preparing factory data partition on a device
@@ -799,9 +799,9 @@ To enable generating the factory data set automatically, go to the example's dir
 .. parsed-literal::
    :class: highlight
 
-   $ west build -b nrf52840dk_nrf52840 -- -DCONFIG_CHIP_FACTORY_DATA=y -DSB_CONFIG_MATTER_FACTORY_DATA_GENERATE=y
+   $ west build -b nrf52840dk_nrf52840 -- -DCONFIG_CHIP_FACTORY_DATA=y -DSB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE=y
 
-Alternatively, you can also add the :kconfig:option:`SB_CONFIG_MATTER_FACTORY_DATA_GENERATE=y` Kconfig setting to the example's :file:`sysbuild.conf` file.
+Alternatively, you can also add the :kconfig:option:`SB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE=y` Kconfig setting to the example's :file:`sysbuild.conf` file.
 
 Each factory data parameter has a default value.
 These are described in the `Matter nRF Connect Kconfig`_.
@@ -817,7 +817,7 @@ For example (replace ``nrf52840dk_nrf52840`` with own board name):
 .. parsed-literal::
    :class: highlight
 
-   $ west build -b nrf52840dk_nrf52840 -- -DCONFIG_CHIP_FACTORY_DATA=y --DSB_CONFIG_MATTER_FACTORY_DATA_GENERATE=y --DCONFIG_CHIP_DEVICE_DISCRIMINATOR=0xF11
+   $ west build -b nrf52840dk_nrf52840 -- -DCONFIG_CHIP_FACTORY_DATA=y --DSB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE=y --DCONFIG_CHIP_DEVICE_DISCRIMINATOR=0xF11
 
 Alternatively, you can add the relevant Kconfig option lines to the example's :file:`prj.conf` file.
 
@@ -917,7 +917,7 @@ To generate new certificates disable using default certificates by building an e
 
    $ west build -b nrf52840dk_nrf52840 -- \
    -DCONFIG_CHIP_FACTORY_DATA=y \
-   -DSB_CONFIG_MATTER_FACTORY_DATA_GENERATE=y \
+   -DSB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE=y \
    -DSB_CONFIG_MATTER_FACTORY_DATA_MERGE_WITH_FIRMWARE=y \
    -DCONFIG_CHIP_FACTORY_DATA_USE_DEFAULT_CERTS=n
 
@@ -989,10 +989,10 @@ To override the inherited classes, complete the following steps:
 #. Disable building both the default and the nRF Connect implementations of factory data providers to start using your own implementation of factory data parser and provider.
    This can be done in one of the following ways:
 
-   * Set the :option:`CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND` Kconfig option to ``y`` in the :file:`prj.conf` file and the :kconfig:option:`SB_CONFIG_MATTER_FACTORY_DATA_GENERATE` Kconfig option to ``n``.
+   * Set the :option:`CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND` Kconfig option to ``y`` in the :file:`prj.conf` file and the :kconfig:option:`SB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE` Kconfig option to ``n``.
    * Build an example with the following option (replace ``<build_target>`` with your board name, for example ``nrf52840dk_nrf52840``):
 
      .. parsed-literal::
         :class: highlight
 
-        $ west build -b <build_target> -- -DCONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND=y -DSB_CONFIG_MATTER_FACTORY_DATA_GENERATE=n
+        $ west build -b <build_target> -- -DCONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND=y -DSB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE=n

docs/matter/end_product/test_event_triggers.rst

@@ -212,10 +212,10 @@ You cannot set the enable key to a specific value using factory data unless the
 If it is not set, the default value ``00112233445566778899AABBCCDDEEFF`` will be used.
 For secure operation, you need to ensure that the enable key is unique for all of your devices.
 
-To specify the enable key through the build system, enable the :kconfig:option:`SB_CONFIG_MATTER_FACTORY_DATA_GENERATE` Kconfig option by setting it to ``y``.
+To specify the enable key through the build system, enable the :kconfig:option:`SB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE` Kconfig option by setting it to ``y``.
 Then, set the :kconfig:option:`CONFIG_CHIP_DEVICE_ENABLE_KEY` Kconfig option to a 32-byte hexadecimal string value.
 
-If :kconfig:option:`SB_CONFIG_MATTER_FACTORY_DATA_GENERATE` is set to ``n``, follow the :ref:`ug_matter_device_factory_provisioning` guide in the Matter documentation to generate the factory data set with the specific key value.
+If :kconfig:option:`SB_CONFIG_MATTER_ADD_ON_FACTORY_DATA_GENERATE` is set to ``n``, follow the :ref:`ug_matter_device_factory_provisioning` guide in the Matter documentation to generate the factory data set with the specific key value.
 
 If you do not use the |NCS| Matter common module, you need to read the enable key value manually from the factory data set and provide it to the ``TestEventTrigger`` class.
 

samples/bridge/Kconfig.sysbuild

@@ -55,7 +55,7 @@ endif # SOC_SERIES_NRF53
 endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
-config MATTER_FACTORY_DATA_GENERATE
+config MATTER_ADD_ON_FACTORY_DATA_GENERATE
 	default y
 
 source "share/sysbuild/Kconfig"

samples/closure/Kconfig.sysbuild

@@ -56,7 +56,7 @@ endif # SOC_SERIES_NRF53
 endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
-config MATTER_FACTORY_DATA_GENERATE
+config MATTER_ADD_ON_FACTORY_DATA_GENERATE
 	default y
 
 source "share/sysbuild/Kconfig"

samples/contact_sensor/Kconfig.sysbuild

@@ -59,7 +59,7 @@ endif # SOC_SERIES_NRF53
 endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
-config MATTER_FACTORY_DATA_GENERATE
+config MATTER_ADD_ON_FACTORY_DATA_GENERATE
 	default y
 
 source "share/sysbuild/Kconfig"

samples/light_bulb/Kconfig.sysbuild

@@ -56,7 +56,7 @@ endif # SOC_SERIES_NRF53
 endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
-config MATTER_FACTORY_DATA_GENERATE
+config MATTER_ADD_ON_FACTORY_DATA_GENERATE
 	default y if !BOARD_NRF21540DK
 
 source "share/sysbuild/Kconfig"

samples/light_switch/Kconfig.sysbuild

@@ -56,7 +56,7 @@ endif # SOC_SERIES_NRF53
 endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
-config MATTER_FACTORY_DATA_GENERATE
+config MATTER_ADD_ON_FACTORY_DATA_GENERATE
 	default y if !BOARD_NRF21540DK
 
 source "share/sysbuild/Kconfig"

samples/manufacturer_specific/Kconfig.sysbuild

@@ -56,7 +56,7 @@ endif # SOC_SERIES_NRF53
 endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
-config MATTER_FACTORY_DATA_GENERATE
+config MATTER_ADD_ON_FACTORY_DATA_GENERATE
 	default y
 
 source "$(ZEPHYR_BASE)/share/sysbuild/Kconfig"

samples/smoke_co_alarm/Kconfig.sysbuild

@@ -56,7 +56,7 @@ endif # SOC_SERIES_NRF53
 endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
-config MATTER_FACTORY_DATA_GENERATE
+config MATTER_ADD_ON_FACTORY_DATA_GENERATE
 	default y
 
 source "share/sysbuild/Kconfig"