Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions samples/wifi/provisioning/ble/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion samples/wifi/radio_test/multi_domain/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/wifi/scan/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/wifi/shell/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/wifi/sta/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions snippets/nrf70-wifi/nrf54h20_cpuapp.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
10 changes: 10 additions & 0 deletions snippets/nrf70-wifi/nrf54h20_cpurad.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* Copyright (c) 2025 Nordic Semiconductor
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/* Conflict with Wi-Fi SPI */
&uart135 {
status = "disabled";
};
3 changes: 3 additions & 0 deletions snippets/nrf70-wifi/snippet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading