Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Batch merge 2.9.0 #19267

Merged
merged 7 commits into from
Dec 5, 2024
Merged

Batch merge 2.9.0 #19267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9f9ca1
maanifest: Update Zephyr revision
carlescufi Dec 4, 2024
f47c379
manifest: Update sdk-sidewalk revision
tejlmand Dec 4, 2024
9a7e663
samples: wifi: radio_test: Move FICR related file to radio test
bama-nordic Dec 3, 2024
afacff0
samples: wifi: radio_test: Disable combo build by default
bama-nordic Dec 3, 2024
837de7f
wifi: Sync with nrf70 buslib changes
bama-nordic Dec 4, 2024
d10bb0c
samples: nrf54l: remove direct RAM retention management
nika-nordic Nov 28, 2024
920fdad
benchmarks: system_off: align to new RAM retention in system_off sample
nika-nordic Nov 29, 2024
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
11 changes: 0 additions & 11 deletions samples/bluetooth/peripheral_power_profiling/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
#include <nfc/ndef/le_oob_rec.h>

#include <helpers/nrfx_reset_reason.h>
#ifdef CONFIG_SOC_NRF54L15_CPUAPP
#include <hal/nrf_memconf.h>
#endif

#include "pwr_service.h"

Expand Down Expand Up @@ -682,14 +679,6 @@ static void system_off(void)
}
}

#ifdef CONFIG_SOC_NRF54L15_CPUAPP
/* Disable RAM retention in System OFF as it is not utilized by this sample. */
uint32_t ram_sections = 8;

nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, BIT_MASK(ram_sections), false);
nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, BIT_MASK(ram_sections), false);
#endif

sys_poweroff();
#endif /* !IS_ENABLED(CONFIG_SOC_SERIES_NRF54HX) */
}
Expand Down
11 changes: 0 additions & 11 deletions samples/nfc/system_off/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
#include <nfc/ndef/text_rec.h>

#include <dk_buttons_and_leds.h>
#ifdef CONFIG_SOC_NRF54L15_CPUAPP
#include <hal/nrf_memconf.h>
#endif

#define SYSTEM_OFF_DELAY_S 3

Expand Down Expand Up @@ -150,14 +147,6 @@ static void system_off(struct k_work *work)
}
}

#ifdef CONFIG_SOC_NRF54L15_CPUAPP
/* Disable RAM retention in System OFF as it is not utilized by this sample. */
uint32_t ram_sections = 8;

nrf_memconf_ramblock_ret_mask_enable_set(NRF_MEMCONF, 0, BIT_MASK(ram_sections), false);
nrf_memconf_ramblock_ret2_mask_enable_set(NRF_MEMCONF, 0, BIT_MASK(ram_sections), false);
#endif

sys_poweroff();
}

Expand Down
1 change: 1 addition & 0 deletions samples/wifi/radio_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ target_sources(app PRIVATE
src/nrf_wifi_radio_test_main.c
src/nrf_wifi_radio_test_shell.c
src/nrf_wifi_radio_ficr_shell.c
src/ficr_prog.c
)
3 changes: 1 addition & 2 deletions samples/wifi/radio_test/Kconfig.sysbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ menu "Network core configuration"
depends on SUPPORT_NETCORE

config SUPPORT_NETCORE_PERIPHERAL_RADIO_TEST
bool
default y
bool "wi-fi ble radio test combo build"

choice NETCORE
prompt "Netcore image"
Expand Down
2 changes: 1 addition & 1 deletion samples/wifi/radio_test/inc/nrf_wifi_radio_test_shell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <ctype.h>
#include <host_rpu_sys_if.h>
#include <fmac_structs.h>
#include "rpu_hw_if.h"
#include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>

struct nrf_wifi_ctx_zep_rt {
struct nrf_wifi_fmac_priv *fmac_priv;
Expand Down
4 changes: 2 additions & 2 deletions samples/wifi/radio_test/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ tests:
sample.nrf7002.radio_test_combo:
sysbuild: true
build_only: true
extra_args: CONFIG_NRF70_RADIO_TEST_COMBO=y
extra_args: SB_CONFIG_SUPPORT_NETCORE_PERIPHERAL_RADIO_TEST=y
integration_platforms:
- nrf7002dk/nrf5340/cpuapp
platform_allow: nrf7002dk/nrf5340/cpuapp
tags: ci_build sysbuild ci_samples_wifi
sample.nrf5340.radio_test_combo:
sysbuild: true
build_only: true
extra_args: SHIELD=nrf7002ek CONFIG_NRF70_RADIO_TEST_COMBO=y
extra_args: SHIELD=nrf7002ek SB_CONFIG_SUPPORT_NETCORE_PERIPHERAL_RADIO_TEST=y
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
platform_allow: nrf5340dk/nrf5340/cpuapp
Expand Down
Loading
Loading