From 499427d45a8a27aec52cba13a0166b98c4651a2c Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Fri, 29 Nov 2024 01:19:51 +0530 Subject: [PATCH] samples: Fix Wi-Fi and BLE combo radio test for 54H When a combo radio test is used for 54H, the peripheral radio test uses the same console as Wi-Fi radio test causing UICR conflicts and failing to boot both APP and RAD. Fix the conflicts by adding an overlay that uses defaults. Fixes SHEL-3287. Signed-off-by: Chaitanya Tata --- .../nrf54h20dk_nrf54h20_cpurad_wifi_combo.overlay | 11 +++++++++++ samples/wifi/radio_test/sample.yaml | 1 + 2 files changed, 12 insertions(+) create mode 100644 samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad_wifi_combo.overlay diff --git a/samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad_wifi_combo.overlay b/samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad_wifi_combo.overlay new file mode 100644 index 000000000000..386691eb0f6c --- /dev/null +++ b/samples/peripheral/radio_test/boards/nrf54h20dk_nrf54h20_cpurad_wifi_combo.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&dppic020 { + status = "okay"; + source-channels = < 0 1 >; + sink-channels = < 2 3 >; +}; diff --git a/samples/wifi/radio_test/sample.yaml b/samples/wifi/radio_test/sample.yaml index e7dbc2f90b99..9ed18d9e8db1 100644 --- a/samples/wifi/radio_test/sample.yaml +++ b/samples/wifi/radio_test/sample.yaml @@ -77,6 +77,7 @@ tests: sysbuild: true build_only: true extra_args: + - FILE_SUFFIX=wifi_combo - radio_test_SHIELD="nrf7002eb_interposer_p1;nrf7002eb" - SNIPPET=nrf70-wifi integration_platforms: