diff --git a/samples/wifi/provisioning/ble/sample.yaml b/samples/wifi/provisioning/ble/sample.yaml index fd46c8960ed2..358e81b785c7 100644 --- a/samples/wifi/provisioning/ble/sample.yaml +++ b/samples/wifi/provisioning/ble/sample.yaml @@ -71,3 +71,17 @@ tests: - ci_build - sysbuild - ci_samples_wifi + sample.nrf7002eb2.nrf54h20.ble-wifi-provision: + sysbuild: true + build_only: true + extra_args: + - ble_SHIELD="nrf7002eb2" + - SNIPPET=nrf70-wifi + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + tags: + - ci_build + - sysbuild + - ci_samples_wifi diff --git a/samples/wifi/radio_test/multi_domain/sample.yaml b/samples/wifi/radio_test/multi_domain/sample.yaml index d21687a25d3d..cf3648a1a5a2 100644 --- a/samples/wifi/radio_test/multi_domain/sample.yaml +++ b/samples/wifi/radio_test/multi_domain/sample.yaml @@ -118,7 +118,7 @@ tests: extra_args: - FILE_SUFFIX=wifi_combo - multi_domain_SHIELD="nrf7002eb2" - - multi_domain_SNIPPET=nrf70-wifi + - SNIPPET=nrf70-wifi integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/wifi/scan/sample.yaml b/samples/wifi/scan/sample.yaml index 955780529983..170098d726b9 100644 --- a/samples/wifi/scan/sample.yaml +++ b/samples/wifi/scan/sample.yaml @@ -93,7 +93,7 @@ tests: build_only: true extra_args: - scan_SHIELD="nrf7002eb2" - - scan_SNIPPET=nrf70-wifi + - SNIPPET=nrf70-wifi integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index c3a7d813cab8..9418f0fc7668 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -336,7 +336,7 @@ tests: build_only: true extra_args: - shell_SHIELD="nrf7002eb2" - - shell_SNIPPET=nrf70-wifi + - SNIPPET=nrf70-wifi integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/wifi/sta/sample.yaml b/samples/wifi/sta/sample.yaml index f103ead0502a..756d2caae3b9 100644 --- a/samples/wifi/sta/sample.yaml +++ b/samples/wifi/sta/sample.yaml @@ -100,7 +100,7 @@ tests: build_only: true extra_args: - sta_SHIELD="nrf7002eb2" - - sta_SNIPPET=nrf70-wifi + - SNIPPET=nrf70-wifi integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - nrf54l15dk/nrf54l15/cpuapp diff --git a/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay b/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay index d102db5d25de..21b4268e45f3 100644 --- a/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay +++ b/snippets/nrf70-wifi/nrf54h20_cpuapp.overlay @@ -4,7 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/delete-node/ &cpuapp_boot_partition; /delete-node/ &cpuapp_slot0_partition; /delete-node/ &cpurad_slot0_partition; /delete-node/ &cpuppr_code_partition; @@ -14,8 +13,8 @@ &mram1x { partitions { - slot0_partition: cpuapp_slot0_partition: partition@30000 { - reg = <0x30000 DT_SIZE_K(1140)>; + slot0_partition: cpuapp_slot0_partition: partition@34000 { + reg = <0x34000 DT_SIZE_K(1076)>; }; cpuppr_code_partition: partition@121000 { diff --git a/snippets/nrf70-wifi/nrf54h20_cpurad.overlay b/snippets/nrf70-wifi/nrf54h20_cpurad.overlay new file mode 100644 index 000000000000..d044fab95a01 --- /dev/null +++ b/snippets/nrf70-wifi/nrf54h20_cpurad.overlay @@ -0,0 +1,10 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/* Conflict with Wi-Fi SPI */ +&uart135 { + status = "disabled"; +}; diff --git a/snippets/nrf70-wifi/snippet.yml b/snippets/nrf70-wifi/snippet.yml index 410fdb5f92eb..80d8fe3fffaa 100644 --- a/snippets/nrf70-wifi/snippet.yml +++ b/snippets/nrf70-wifi/snippet.yml @@ -8,6 +8,9 @@ boards: append: EXTRA_CONF_FILE: nrf54h20_cpuapp.conf EXTRA_DTC_OVERLAY_FILE: nrf54h20_cpuapp.overlay + nrf54h20dk/nrf54h20/cpurad: + append: + EXTRA_DTC_OVERLAY_FILE: nrf54h20_cpurad.overlay nrf54l15dk/nrf54l15/cpuapp: append: EXTRA_CONF_FILE: nrf54l15_cpuapp.conf diff --git a/west.yml b/west.yml index aec1c3d732aa..c56296dad738 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 2c2453cac1d41be138c047e94c510a4189c695af + revision: 72ecd41ad7f33544dbe2e68437a3fe3f7cd8e5ad import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above