diff --git a/samples/subsys/settings/boards/mimxrt1020_evk.conf b/samples/subsys/settings/boards/mimxrt1020_evk.conf deleted file mode 100644 index 3746c13c741b0..0000000000000 --- a/samples/subsys/settings/boards/mimxrt1020_evk.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/mr_canhubk3.conf b/samples/subsys/settings/boards/mr_canhubk3.conf deleted file mode 100644 index 6ca210a81ac21..0000000000000 --- a/samples/subsys/settings/boards/mr_canhubk3.conf +++ /dev/null @@ -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" diff --git a/samples/subsys/settings/boards/native_sim.conf b/samples/subsys/settings/boards/native_sim.conf deleted file mode 100644 index 21877f886f3a7..0000000000000 --- a/samples/subsys/settings/boards/native_sim.conf +++ /dev/null @@ -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" diff --git a/samples/subsys/settings/boards/native_sim.overlay b/samples/subsys/settings/boards/native_sim.overlay deleted file mode 100644 index 0e4839ad02658..0000000000000 --- a/samples/subsys/settings/boards/native_sim.overlay +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2019 Jan Van Winkel - * - * 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>; - }; - }; -}; diff --git a/samples/subsys/settings/boards/native_sim_native_64.conf b/samples/subsys/settings/boards/native_sim_native_64.conf deleted file mode 100644 index 21877f886f3a7..0000000000000 --- a/samples/subsys/settings/boards/native_sim_native_64.conf +++ /dev/null @@ -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" diff --git a/samples/subsys/settings/boards/native_sim_native_64.overlay b/samples/subsys/settings/boards/native_sim_native_64.overlay deleted file mode 100644 index e4994493dd696..0000000000000 --- a/samples/subsys/settings/boards/native_sim_native_64.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "native_sim.overlay" diff --git a/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf b/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf deleted file mode 100644 index 248bc56424e34..0000000000000 --- a/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_ARM_MPU=n diff --git a/samples/subsys/settings/boards/nrf52dk_nrf52832.conf b/samples/subsys/settings/boards/nrf52dk_nrf52832.conf deleted file mode 100644 index 248bc56424e34..0000000000000 --- a/samples/subsys/settings/boards/nrf52dk_nrf52832.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_ARM_MPU=n diff --git a/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf deleted file mode 100644 index 3746c13c741b0..0000000000000 --- a/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf deleted file mode 100644 index 3746c13c741b0..0000000000000 --- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf deleted file mode 100644 index 3746c13c741b0..0000000000000 --- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf deleted file mode 100644 index 3746c13c741b0..0000000000000 --- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/qemu_x86.conf b/samples/subsys/settings/boards/qemu_x86.conf deleted file mode 100644 index 3746c13c741b0..0000000000000 --- a/samples/subsys/settings/boards/qemu_x86.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf deleted file mode 100644 index 1535e4d46cd99..0000000000000 --- a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2024 NXP -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf deleted file mode 100644 index 1535e4d46cd99..0000000000000 --- a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2024 NXP -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/boards/yd_esp32_procpu.conf b/samples/subsys/settings/boards/yd_esp32_procpu.conf deleted file mode 100644 index 498fb072287d6..0000000000000 --- a/samples/subsys/settings/boards/yd_esp32_procpu.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/prj.conf b/samples/subsys/settings/prj.conf index 25c662538460e..d9ae787141afd 100644 --- a/samples/subsys/settings/prj.conf +++ b/samples/subsys/settings/prj.conf @@ -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 diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml index aafc61e555ecd..7dcf6c457204c 100644 --- a/samples/subsys/settings/sample.yaml +++ b/samples/subsys/settings/sample.yaml @@ -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 diff --git a/samples/subsys/settings/socs/cc1352p7.conf b/samples/subsys/settings/socs/cc1352p7.conf deleted file mode 100644 index ca92a061c6a37..0000000000000 --- a/samples/subsys/settings/socs/cc1352p7.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NVS=y diff --git a/samples/subsys/settings/socs/esp32_procpu.conf b/samples/subsys/settings/socs/esp32_procpu.conf deleted file mode 100644 index 498fb072287d6..0000000000000 --- a/samples/subsys/settings/socs/esp32_procpu.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/socs/esp32c3.conf b/samples/subsys/settings/socs/esp32c3.conf deleted file mode 100644 index 498fb072287d6..0000000000000 --- a/samples/subsys/settings/socs/esp32c3.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/socs/esp32c3_usb.conf b/samples/subsys/settings/socs/esp32c3_usb.conf deleted file mode 100644 index 498fb072287d6..0000000000000 --- a/samples/subsys/settings/socs/esp32c3_usb.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/socs/esp32c6.conf b/samples/subsys/settings/socs/esp32c6.conf deleted file mode 100644 index 498fb072287d6..0000000000000 --- a/samples/subsys/settings/socs/esp32c6.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/socs/esp32s2.conf b/samples/subsys/settings/socs/esp32s2.conf deleted file mode 100644 index 498fb072287d6..0000000000000 --- a/samples/subsys/settings/socs/esp32s2.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/socs/esp32s3_procpu.conf b/samples/subsys/settings/socs/esp32s3_procpu.conf deleted file mode 100644 index 498fb072287d6..0000000000000 --- a/samples/subsys/settings/socs/esp32s3_procpu.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y