michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: settings: cleanup and use filters

Browse source 
Almost all overlays only enable NVS and SETTINGS_NVS, something that
should be enabled in sample directly. Remove all overlays and make the
sample more genenric.

Use filter on storage partition to enable testing the sample on more
plaforms.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2025-02-28 08:24:19 -05:00 • committed by Benjamin Cabé
commit 270c4e4cab
25 changed files with 7 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
samples/subsys/settings/boards/mimxrt1020_evk.conf
View file

@ -1,2 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

8
samples/subsys/settings/boards/mr_canhubk3.conf
View file

@ -1,8 +0,0 @@
# Copyright 2023 NXP
# SPDX-License-Identifier: Apache-2.0
# Use LittleFS file system as Settings backend
CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_SETTINGS_FILE=y
CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"

5
samples/subsys/settings/boards/native_sim.conf
View file

@ -1,5 +0,0 @@
# Enable the LittleFS file system.
CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_SETTINGS_FILE=y
CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"

22
samples/subsys/settings/boards/native_sim.overlay
View file

@ -1,22 +0,0 @@
/*
* Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
*
* SPDX-License-Identifier: Apache-2.0
*/
/delete-node/ &storage_partition;
/delete-node/ &scratch_partition;
&flash0 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
storage_partition: partition@70000 {
label = "storage";
reg = <0x00070000 0x8000>;
};
};
};

5
samples/subsys/settings/boards/native_sim_native_64.conf
View file

@ -1,5 +0,0 @@
# Enable the LittleFS file system.
CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_SETTINGS_FILE=y
CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"

7
samples/subsys/settings/boards/native_sim_native_64.overlay
View file

@ -1,7 +0,0 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "native_sim.overlay"

3
samples/subsys/settings/boards/nrf52840dk_nrf52840.conf
View file

@ -1,3 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_ARM_MPU=n

3
samples/subsys/settings/boards/nrf52dk_nrf52832.conf
View file

@ -1,3 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_ARM_MPU=n

2
samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file

@ -1,2 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

2
samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
View file

@ -1,2 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

2
samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
View file

@ -1,2 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

2
samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
View file

@ -1,2 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

2
samples/subsys/settings/boards/qemu_x86.conf
View file

@ -1,2 +0,0 @@
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

5
samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
View file

@ -1,5 +0,0 @@
# Copyright 2024 NXP
# SPDX-License-Identifier: Apache-2.0
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

5
samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
View file

@ -1,5 +0,0 @@
# Copyright 2024 NXP
# SPDX-License-Identifier: Apache-2.0
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y

4
samples/subsys/settings/boards/yd_esp32_procpu.conf
View file

@ -1,4 +0,0 @@
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y

5
samples/subsys/settings/prj.conf
View file

@ -1,6 +1,9 @@
CONFIG_STDOUT_CONSOLE=y
CONFIG_FLASH=y
CONFIG_FLASH_MAP=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_RUNTIME=y
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_MPU_ALLOW_FLASH_WRITE=y

16
samples/subsys/settings/sample.yaml
View file

@ -5,19 +5,9 @@ tests:
sample.subsys.settings:
tags: settings
timeout: 10
platform_allow:
- qemu_x86
- native_sim
- native_sim/native/64
- mr_canhubk3
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
- s32z2xxdc2/s32z270/rtu0
- s32z2xxdc2/s32z270/rtu1
- s32z2xxdc2@D/s32z270/rtu0
- s32z2xxdc2@D/s32z270/rtu1
filter: dt_label_with_parent_compat_enabled("storage_partition", "fixed-partitions")
platform_exclude:
- qemu_cortex_m0/nrf51822
integration_platforms:
- native_sim
harness: console

1
samples/subsys/settings/socs/cc1352p7.conf
View file

@ -1 +0,0 @@
CONFIG_NVS=y

4
samples/subsys/settings/socs/esp32_procpu.conf
View file

@ -1,4 +0,0 @@
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y

4
samples/subsys/settings/socs/esp32c3.conf
View file

@ -1,4 +0,0 @@
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y

4
samples/subsys/settings/socs/esp32c3_usb.conf
View file

@ -1,4 +0,0 @@
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y

4
samples/subsys/settings/socs/esp32c6.conf
View file

@ -1,4 +0,0 @@
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y

4
samples/subsys/settings/socs/esp32s2.conf
View file

@ -1,4 +0,0 @@
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y

4
samples/subsys/settings/socs/esp32s3_procpu.conf
View file

@ -1,4 +0,0 @@
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_NVS=y
CONFIG_SETTINGS_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y