Skip to content

Systemoff console checking #2291

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

Merged
merged 3 commits into from
Nov 28, 2024
Merged

Systemoff console checking #2291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b577174
[nrf fromtree] boards: nrf54l15dk: Enable tests and samples for the L…
carlescufi Nov 21, 2024
121bd23
[nrf fromlist] samples: boards: nordic: system_off: add console checking
nordic-piks Nov 21, 2024
8dd9151
[nrf fromlist] tests: drivers: gpio: gpio_basic_api: restore support …
nordic-piks Nov 28, 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
25 changes: 25 additions & 0 deletions samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l05_cpuapp_retained_mem.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/ {
cpuapp_sram@20017000 {
compatible = "zephyr,memory-region", "mmio-sram";
reg = <0x20017000 DT_SIZE_K(4)>;
zephyr,memory-region = "RetainedMem";
status = "okay";

retainedmem0: retainedmem {
compatible = "zephyr,retained-ram";
status = "okay";
};
};

aliases {
retainedmemdevice = &retainedmem0;
};
};

&cpuapp_sram {
/* Shrink SRAM size to avoid overlap with retained memory region:
* 96 - 4 = 92KB = 0x17000
*/
reg = <0x20000000 0x17000>;
ranges = <0x0 0x20000000 0x17000>;
};
25 changes: 25 additions & 0 deletions samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l10_cpuapp_retained_mem.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/ {
cpuapp_sram@2002f000 {
compatible = "zephyr,memory-region", "mmio-sram";
reg = <0x2002f000 DT_SIZE_K(4)>;
zephyr,memory-region = "RetainedMem";
status = "okay";

retainedmem0: retainedmem {
compatible = "zephyr,retained-ram";
status = "okay";
};
};

aliases {
retainedmemdevice = &retainedmem0;
};
};

&cpuapp_sram {
/* Shrink SRAM size to avoid overlap with retained memory region:
* 192 - 4 = 188KB = 0x2f000
*/
reg = <0x20000000 0x2f000>;
ranges = <0x0 0x20000000 0x2f000>;
};
80 changes: 74 additions & 6 deletions samples/boards/nordic/system_off/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,102 @@ common:
tags: power
tests:
sample.boards.nrf.system_off:
build_only: true
integration_platforms:
- nrf52840dk/nrf52840
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
- nrf51dk/nrf51822
- nrf52840dk/nrf52840
- nrf52dk/nrf52832
- nrf51dk/nrf51822
- nrf5340dk/nrf5340/cpuapp
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
harness: console
harness_config:
type: multi_line
ordered: true
regex:
- "system off demo"
- "Retained data not supported"
- "Entering system off; press sw0 to restart"
sample.boards.nrf.system_off.nrf_retained:
build_only: true
integration_platforms:
- nrf52840dk/nrf52840
platform_allow:
- nrf52840dk/nrf52840
- nrf52dk/nrf52832
extra_configs:
- CONFIG_APP_USE_NRF_RETENTION=y
harness: console
harness_config:
type: multi_line
ordered: true
regex:
- "system off demo"
- "Retained data: INVALID"
- "Boot count: 1"
- "Off count: 0"
- "Active Ticks:"
- "Entering system off; press sw0 to restart"
sample.boards.nrf.system_off.retained_mem:
extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
build_only: true
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
extra_configs:
- CONFIG_APP_USE_RETAINED_MEM=y
- CONFIG_RETAINED_MEM=y
harness: console
harness_config:
type: multi_line
ordered: true
regex:
- "system off demo"
- "Retained data: INVALID"
- "Boot count: 1"
- "Off count: 0"
- "Active Ticks:"
- "Entering system off; press sw0 to restart"
sample.boards.nrf.system_off.grtc_wakeup:
build_only: true
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
extra_configs:
- CONFIG_GRTC_WAKEUP_ENABLE=y
harness: console
harness_config:
type: multi_line
ordered: true
regex:
- "system off demo"
- "Retained data not supported"
- "Entering system off; wait 2 seconds to restart"
- "system off demo"
- "Retained data not supported"
- "Entering system off; wait 2 seconds to restart"
- "system off demo"
- "Retained data not supported"
- "Entering system off; wait 2 seconds to restart"
sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_retained_mem.overlay"
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
extra_configs:
- CONFIG_APP_USE_RETAINED_MEM=y
- CONFIG_GRTC_WAKEUP_ENABLE=y
- CONFIG_RETAINED_MEM=y
harness: console
harness_config:
type: multi_line
ordered: true
regex:
- "system off demo"
- "Retained data: INVALID"
- "Boot count: 1"
- "Off count: 0"
- "Active Ticks:"
- "Entering system off; wait 2 seconds to restart"
- "system off demo"
- "Retained data: valid"
- "Boot count: 2"
- "Off count: 1"
- "Active Ticks:"
- "Entering system off; wait 2 seconds to restart"
2 changes: 2 additions & 0 deletions samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
2 changes: 2 additions & 0 deletions samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
2 changes: 2 additions & 0 deletions samples/subsys/settings/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ tests:
- native_sim
- native_sim/native/64
- mr_canhubk3
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
integration_platforms:
Expand Down
2 changes: 2 additions & 0 deletions tests/drivers/flash/common/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ tests:
- mimxrt1060_evk
drivers.flash.common.no_explicit_erase:
platform_allow:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
drivers.flash.common.tfm_ns:
Expand Down
1 change: 1 addition & 0 deletions tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
1 change: 1 addition & 0 deletions tests/drivers/gpio/gpio_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr_xip.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
1 change: 1 addition & 0 deletions tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_POWEROFF=y
25 changes: 25 additions & 0 deletions tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/ {
cpuapp_sram@20017000 {
compatible = "zephyr,memory-region", "mmio-sram";
reg = <0x20017000 DT_SIZE_K(4)>;
zephyr,memory-region = "RetainedMem";
status = "okay";

retainedmem0: retainedmem {
compatible = "zephyr,retained-ram";
status = "okay";
};
};

aliases {
retainedmemtestdevice = &retainedmem0;
};
};

&cpuapp_sram {
/* Shrink SRAM size to avoid overlap with retained memory region:
* 96 - 4 = 92KB = 0x17000
*/
reg = <0x20000000 0x17000>;
ranges = <0x0 0x20000000 0x17000>;
};
1 change: 1 addition & 0 deletions tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_POWEROFF=y
25 changes: 25 additions & 0 deletions tests/drivers/retained_mem/api/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/ {
cpuapp_sram@2002f000 {
compatible = "zephyr,memory-region", "mmio-sram";
reg = <0x2002f000 DT_SIZE_K(4)>;
zephyr,memory-region = "RetainedMem";
status = "okay";

retainedmem0: retainedmem {
compatible = "zephyr,retained-ram";
status = "okay";
};
};

aliases {
retainedmemtestdevice = &retainedmem0;
};
};

&cpuapp_sram {
/* Shrink SRAM size to avoid overlap with retained memory region:
* 192 - 4 = 188KB = 0x2f000
*/
reg = <0x20000000 0x2f000>;
ranges = <0x0 0x20000000 0x2f000>;
};
2 changes: 2 additions & 0 deletions tests/drivers/retained_mem/api/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ tests:
- qemu_cortex_m3
- nrf54h20dk/nrf54h20/cpuapp
- nrf54h20dk/nrf54h20/cpurad
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
tags:
- drivers
Expand Down