54h: Fix Wi-Fi + Peripheral radio test combo

Below are the fixes:

1. The snippet should be applied to both the images for the RAD boot
   address to be the same
2. Move the UART switch to snippet from the sample, remove the special
   "wifi_combo" overlay. This simplifies duplicating changes from
   original file to fix build and functionality.
3. Enable RAD and peripheral radio test for combo build.

Signed-off-by: Chaitanya Tata <[email protected]>

Author: krish2718

samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad_wifi_combo.overlay

@@ -99,9 +99,10 @@ tests:
     sysbuild: true
     build_only: true
     extra_args:
-      - FILE_SUFFIX=wifi_combo
       - multi_domain_SHIELD="nrf7002eb_interposer_p1;nrf7002eb"
-      - multi_domain_SNIPPET=nrf70-wifi
+      - SNIPPET=nrf70-wifi
+      - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
+      - SB_CONFIG_SUPPORT_NETCORE_PERIPHERAL_RADIO_TEST=y
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
@@ -116,7 +117,6 @@ tests:
     sysbuild: true
     build_only: true
     extra_args:
-      - FILE_SUFFIX=wifi_combo
       - multi_domain_SHIELD="nrf7002eb2"
       - SNIPPET=nrf70-wifi
     integration_platforms:

samples/wifi/radio_test/multi_domain/sample.yaml

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/{
+	chosen {
+		zephyr,console = &uart135;
+		zephyr,shell-uart = &uart135;
+	};
+};
+
+/* Redo the partitions, copied from nrf54h20_wifi_memory_map.overlay */
+&mram1x {
+	/delete-node/ partitions;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuapp_boot_partition: partition@30000 {
+			reg = <0x30000 DT_SIZE_K(64)>;
+		};
+
+		slot0_partition: cpuapp_slot0_partition: partition@40000 {
+			reg = <0x40000 DT_SIZE_K(1076)>;
+		};
+
+		cpurad_slot0_partition: partition@14d000 {
+			reg = <0x14d000 DT_SIZE_K(328)>;
+		};
+
+		cpuppr_code_partition: partition@19f000 {
+			reg = <0x19f000 DT_SIZE_K(64)>;
+		};
+
+		cpuflpr_code_partition: partition@1af000 {
+			reg = <0x1af000 DT_SIZE_K(48)>;
+		};
+
+		storage_partition: partition@1bb000 {
+			reg = <0x1bb000 DT_SIZE_K(40)>;
+		};
+
+		periphconf_partition: partition@1c5000 {
+			reg = <0x1c5000 DT_SIZE_K(8)>;
+		};
+	};
+};
+
+/* Used by UARTE135 */
+&cpurad_dma_region {
+	status = "okay";
+};
+
+&uart135 {
+	status = "okay";
+};
+
+/* Used by CPUAPP */
+&uart136 {
+	status = "disabled";
+};

snippets/nrf70-wifi/nrf54h20_rad_new_memory_map.overlay

@@ -11,7 +11,7 @@ boards:
   nrf54h20dk/nrf54h20/cpurad:
     append:
       EXTRA_CONF_FILE: nrf54h20_cpurad.conf
-      EXTRA_DTC_OVERLAY_FILE: nrf54h20_wifi_memory_map.overlay
+      EXTRA_DTC_OVERLAY_FILE: nrf54h20_rad_new_memory_map.overlay
   nrf54l15dk/nrf54l15/cpuapp:
     append:
       EXTRA_CONF_FILE: nrf54l15_cpuapp.conf