samples: matter: Fix image-scoped shield variable names

Sysbuild derives the main image name from the application directory.
The bridge and weather station docs and test scenarios still used
matter_bridge_SHIELD and matter_weather_station_SHIELD, which match no
image, so CONFIG_SHIELD and CONFIG_CHIP_WIFI stayed disabled on Wi-Fi
builds.

Rename to bridge_SHIELD and weather_station_SHIELD, and fix the
internal-memory doc example to use the directory name "bridge".

Signed-off-by: Michał Szablowski <michal.szablowski@nordicsemi.no>

Author: doublemis1

docs/bridge/matter_bridge_description.rst

@@ -501,7 +501,7 @@ Configuring the number of Bluetooth LE bridged devices
 
                   .. group-tab:: |nRFVSC|
 
-                     Add ``-DSB_CONFIG_WIFI_NRF70=y -Dmatter_bridge_SHIELD=nrf7002eb2 -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="bt_max_connections_app.conf"`` to :guilabel:`Extra CMake arguments` in your build configuration.
+                     Add ``-DSB_CONFIG_WIFI_NRF70=y -Dbridge_SHIELD=nrf7002eb2 -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="bt_max_connections_app.conf"`` to :guilabel:`Extra CMake arguments` in your build configuration.
 
                   .. group-tab:: Command line
 
@@ -510,7 +510,7 @@ Configuring the number of Bluetooth LE bridged devices
                      .. parsed-literal::
                         :class: highlight
 
-                        west build -b nrf54lm20dk/nrf54lm20b/cpuapp -- -DSB_CONFIG_WIFI_NRF70=y -Dmatter_bridge_SHIELD=nrf7002eb2 -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="bt_max_connections_app.conf"
+                        west build -b nrf54lm20dk/nrf54lm20b/cpuapp -- -DSB_CONFIG_WIFI_NRF70=y -Dbridge_SHIELD=nrf7002eb2 -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="bt_max_connections_app.conf"
 
             .. group-tab:: Matter bridge over Thread
 

docs/includes/configuration/advanced/internal_memory.txt

@@ -31,7 +31,7 @@ Internal memory only
 
        .. group-tab:: |nRFVSC|
 
-          Add ``-DCONFIG_CHIP_DFU_OVER_BT_SMP=y -DFILE_SUFFIX=internal -D<sample_name>_EXTRA_CONF_FILE=prj_release.conf`` to :guilabel:`Extra CMake arguments` in your build configuration, replacing ``<sample_name>`` with the actual |matter_type| name (for example ``light_bulb`` or ``matter_bridge``).
+          Add ``-DCONFIG_CHIP_DFU_OVER_BT_SMP=y -DFILE_SUFFIX=internal -D<sample_name>_EXTRA_CONF_FILE=prj_release.conf`` to :guilabel:`Extra CMake arguments` in your build configuration, replacing ``<sample_name>`` with the actual |matter_type| directory name (for example ``light_bulb`` or ``bridge``).
 
        .. group-tab:: Command line
 

samples/bridge/sample.yaml

@@ -28,7 +28,7 @@ tests:
       - FILE_SUFFIX=release
       - CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n
       - CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y
-      - matter_bridge_SHIELD=nrf7002eb2
+      - bridge_SHIELD=nrf7002eb2
       - SB_CONFIG_WIFI_NRF70=y
     integration_platforms:
       - nrf54lm20dk/nrf54lm20b/cpuapp
@@ -56,7 +56,7 @@ tests:
     extra_args:
       - CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n
       - CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y
-      - matter_bridge_SHIELD=nrf7002eb2
+      - bridge_SHIELD=nrf7002eb2
       - SB_CONFIG_WIFI_NRF70=y
     integration_platforms:
       - nrf54lm20dk/nrf54lm20b/cpuapp
@@ -86,7 +86,7 @@ tests:
       - CONFIG_BRIDGED_DEVICE_BT=y
       - CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n
       - CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y
-      - matter_bridge_SHIELD=nrf7002eb2
+      - bridge_SHIELD=nrf7002eb2
       - SB_CONFIG_WIFI_NRF70=y
     integration_platforms:
       - nrf54lm20dk/nrf54lm20b/cpuapp
@@ -118,7 +118,7 @@ tests:
       - CONFIG_BRIDGED_DEVICE_BT=y
       - CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n
       - CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y
-      - matter_bridge_SHIELD=nrf7002eb2
+      - bridge_SHIELD=nrf7002eb2
       - SB_CONFIG_WIFI_NRF70=y
     integration_platforms:
       - nrf54lm20dk/nrf54lm20b/cpuapp
@@ -148,7 +148,7 @@ tests:
       - CONFIG_BRIDGED_DEVICE_BT=y
       - CONFIG_BRIDGE_GENERIC_SWITCH_BRIDGED_DEVICE=n
       - CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE=y
-      - matter_bridge_SHIELD=nrf7002eb2
+      - bridge_SHIELD=nrf7002eb2
       - SB_CONFIG_WIFI_NRF70=y
     integration_platforms:
       - nrf54lm20dk/nrf54lm20b/cpuapp

samples/weather_station/README.rst

@@ -213,15 +213,15 @@ Building for the nRF7002 Wi-Fi expansion board
 
          .. group-tab:: |nRFVSC|
 
-            To build the application in the |nRFVSC| IDE for Thingy:53 with the nRF7002 EB attached, add ``-Dmatter_weather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF70=y`` to :guilabel:`Extra CMake arguments` in your build configuration.
+            To build the application in the |nRFVSC| IDE for Thingy:53 with the nRF7002 EB attached, add ``-Dweather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF70=y`` to :guilabel:`Extra CMake arguments` in your build configuration.
 
          .. group-tab:: Command line
 
             To build the sample from the command line for Thingy:53 with the nRF7002 EB attached, use the following command within the sample directory:
 
             .. code-block:: console
 
-               west build -b thingy53/nrf5340/cpuapp -- -Dmatter_weather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF70=y
+               west build -b thingy53/nrf5340/cpuapp -- -Dweather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF70=y
 
 Testing
 *******