From b1bd5f0af8968757d8ed1983b239c5fbf1a7c69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 6 Mar 2025 08:46:50 +0100 Subject: [PATCH 1/8] [nrf fromtree] samples: esp32c3: Add USB variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add USB variant config files for esp32c3 boards. Signed-off-by: Raffael Rostagno Signed-off-by: Sebastian Głąb (cherry picked from commit 8048a6ab6767298c3c45557ab470e86820851bc5) --- .../deep_sleep/socs/esp32c3_usb.conf | 1 + .../deep_sleep/socs/esp32c3_usb.overlay | 21 +++++++++++++++++++ .../counter/alarm/socs/esp32c3_usb.overlay | 3 +++ samples/net/wifi/shell/socs/esp32c3_usb.conf | 11 ++++++++++ .../net/wifi/shell/socs/esp32c3_usb.overlay | 9 ++++++++ .../die_temp_polling/socs/esp32c3_usb.conf | 1 + .../die_temp_polling/socs/esp32c3_usb.overlay | 11 ++++++++++ samples/subsys/nvs/socs/esp32c3_usb.conf | 1 + samples/subsys/settings/socs/esp32c3_usb.conf | 4 ++++ 9 files changed, 62 insertions(+) create mode 100644 samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf create mode 100644 samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay create mode 100644 samples/drivers/counter/alarm/socs/esp32c3_usb.overlay create mode 100644 samples/net/wifi/shell/socs/esp32c3_usb.conf create mode 100644 samples/net/wifi/shell/socs/esp32c3_usb.overlay create mode 100644 samples/sensor/die_temp_polling/socs/esp32c3_usb.conf create mode 100644 samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay create mode 100644 samples/subsys/nvs/socs/esp32c3_usb.conf create mode 100644 samples/subsys/settings/socs/esp32c3_usb.conf diff --git a/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf new file mode 100644 index 00000000000..2ce9f6b8f5c --- /dev/null +++ b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.conf @@ -0,0 +1 @@ +CONFIG_EXAMPLE_GPIO_WAKEUP=y diff --git a/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay new file mode 100644 index 00000000000..6235a933aec --- /dev/null +++ b/samples/boards/espressif/deep_sleep/socs/esp32c3_usb.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + aliases { + /* On ESP32-C3, only GPIO0~5 can be used + * as wake-up sources + */ + wakeup-button = &sample_button; + }; + + gpio_keys { + compatible = "gpio-keys"; + sample_button: sample_button { + gpios = <&gpio0 0 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; + }; + }; +}; diff --git a/samples/drivers/counter/alarm/socs/esp32c3_usb.overlay b/samples/drivers/counter/alarm/socs/esp32c3_usb.overlay new file mode 100644 index 00000000000..241947b0643 --- /dev/null +++ b/samples/drivers/counter/alarm/socs/esp32c3_usb.overlay @@ -0,0 +1,3 @@ +&timer0 { + status = "okay"; +}; diff --git a/samples/net/wifi/shell/socs/esp32c3_usb.conf b/samples/net/wifi/shell/socs/esp32c3_usb.conf new file mode 100644 index 00000000000..a72fdf39efa --- /dev/null +++ b/samples/net/wifi/shell/socs/esp32c3_usb.conf @@ -0,0 +1,11 @@ +CONFIG_WIFI=y + +CONFIG_NETWORKING=y +CONFIG_NET_L2_ETHERNET=y + +CONFIG_NET_IPV6=n +CONFIG_NET_IPV4=y +CONFIG_NET_DHCPV4=y +CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y + +CONFIG_NET_LOG=y diff --git a/samples/net/wifi/shell/socs/esp32c3_usb.overlay b/samples/net/wifi/shell/socs/esp32c3_usb.overlay new file mode 100644 index 00000000000..ea9865cf5f8 --- /dev/null +++ b/samples/net/wifi/shell/socs/esp32c3_usb.overlay @@ -0,0 +1,9 @@ +/* + * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&wifi { + status = "okay"; +}; diff --git a/samples/sensor/die_temp_polling/socs/esp32c3_usb.conf b/samples/sensor/die_temp_polling/socs/esp32c3_usb.conf new file mode 100644 index 00000000000..5ab7306afeb --- /dev/null +++ b/samples/sensor/die_temp_polling/socs/esp32c3_usb.conf @@ -0,0 +1 @@ +CONFIG_REQUIRES_FULL_LIBC=y diff --git a/samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay b/samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay new file mode 100644 index 00000000000..a1229102bf8 --- /dev/null +++ b/samples/sensor/die_temp_polling/socs/esp32c3_usb.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2023, Hiroki Tada + * + * SPDX-License-Identifier: Apache-2.0 + * + * Application overlay for creating temperature sensor device instance + */ + +&coretemp { + status = "okay"; +}; diff --git a/samples/subsys/nvs/socs/esp32c3_usb.conf b/samples/subsys/nvs/socs/esp32c3_usb.conf new file mode 100644 index 00000000000..26d52701286 --- /dev/null +++ b/samples/subsys/nvs/socs/esp32c3_usb.conf @@ -0,0 +1 @@ +CONFIG_HEAP_MEM_POOL_SIZE=256 diff --git a/samples/subsys/settings/socs/esp32c3_usb.conf b/samples/subsys/settings/socs/esp32c3_usb.conf new file mode 100644 index 00000000000..498fb072287 --- /dev/null +++ b/samples/subsys/settings/socs/esp32c3_usb.conf @@ -0,0 +1,4 @@ +CONFIG_HEAP_MEM_POOL_SIZE=256 +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y +CONFIG_MPU_ALLOW_FLASH_WRITE=y From c05519fb2256a29a57a5967e98ae9b9b62fad1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Wed, 19 Feb 2025 10:42:52 +0100 Subject: [PATCH 2/8] [nrf fromtree] samples: enable flash samples for s32z board MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable flash samples for s32z board Signed-off-by: Cong Nguyen Huu Signed-off-by: Sebastian Głąb (cherry picked from commit 862706380eec4ea4b5833a0277a95fa4e00f148b) --- samples/subsys/fs/littlefs/sample.yaml | 4 ++++ samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf | 5 +++++ samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf | 5 +++++ samples/subsys/settings/sample.yaml | 4 ++++ samples/subsys/shell/fs/sample.yaml | 4 ++++ 5 files changed, 22 insertions(+) create mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf create mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml index 4d7f742dd85..85fa6468ee4 100644 --- a/samples/subsys/fs/littlefs/sample.yaml +++ b/samples/subsys/fs/littlefs/sample.yaml @@ -26,6 +26,10 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - frdm_ke17z - frdm_ke17z512 + - s32z2xxdc2/s32z270/rtu0 + - s32z2xxdc2/s32z270/rtu1 + - s32z2xxdc2@D/s32z270/rtu0 + - s32z2xxdc2@D/s32z270/rtu1 integration_platforms: - nrf52840dk/nrf52840 sample.filesystem.littlefs.blk: diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf new file mode 100644 index 00000000000..1535e4d46cd --- /dev/null +++ b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf @@ -0,0 +1,5 @@ +# 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 new file mode 100644 index 00000000000..1535e4d46cd --- /dev/null +++ b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf @@ -0,0 +1,5 @@ +# Copyright 2024 NXP +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml index 58367465166..aafc61e555e 100644 --- a/samples/subsys/settings/sample.yaml +++ b/samples/subsys/settings/sample.yaml @@ -14,6 +14,10 @@ tests: - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp + - s32z2xxdc2/s32z270/rtu0 + - s32z2xxdc2/s32z270/rtu1 + - s32z2xxdc2@D/s32z270/rtu0 + - s32z2xxdc2@D/s32z270/rtu1 integration_platforms: - native_sim harness: console diff --git a/samples/subsys/shell/fs/sample.yaml b/samples/subsys/shell/fs/sample.yaml index a0919b97af7..afba7ddf0e2 100644 --- a/samples/subsys/shell/fs/sample.yaml +++ b/samples/subsys/shell/fs/sample.yaml @@ -13,6 +13,10 @@ tests: - mimxrt1060_evk/mimxrt1062/qspi - mr_canhubk3 - native_sim + - s32z2xxdc2/s32z270/rtu0 + - s32z2xxdc2/s32z270/rtu1 + - s32z2xxdc2@D/s32z270/rtu0 + - s32z2xxdc2@D/s32z270/rtu1 integration_platforms: - reel_board sample.filesystem.shell.fuse: From 5c94c89d24dfcd94faaeaf1bd0ddbf1a06be13c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 6 Mar 2025 08:50:01 +0100 Subject: [PATCH 3/8] [nrf fromtree] samples: settings: Enable NVS backend on mimxrt1020_evk board MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tests for settings will not work properly with just provided config file for mimxrt1020: west build -p always -b mimxrt1020_evk samples/subsys/settings as there the settings_save_one() would return -2 (-ENOENT) as by default the CONFIG_SETTINGS_NONE is defined for mimxrt1020 configuration. For proper operation (i.e. to have a memory medium to store settings values) the NVS backend needs to be enabled. Signed-off-by: Lukasz Majewski Signed-off-by: Sebastian Głąb (cherry picked from commit 8719abaaa01d09ecf54f9c41caea755c2b97e992) --- samples/subsys/settings/boards/mimxrt1020_evk.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 samples/subsys/settings/boards/mimxrt1020_evk.conf diff --git a/samples/subsys/settings/boards/mimxrt1020_evk.conf b/samples/subsys/settings/boards/mimxrt1020_evk.conf new file mode 100644 index 00000000000..3746c13c741 --- /dev/null +++ b/samples/subsys/settings/boards/mimxrt1020_evk.conf @@ -0,0 +1,2 @@ +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y From 6105e80fb72ac643a2aa88f4a9fd6a73460acae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 6 Mar 2025 09:54:46 +0100 Subject: [PATCH 4/8] [nrf fromtree] samples: adc: esp32s2: Fix unsupported resolution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit S2 has 12-bit ADC. Signed-off-by: Marek Matej Signed-off-by: Sebastian Głąb (cherry picked from commit 37f2f7effded00e55dd69f6fc67102f3c0fbeb85) --- samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay b/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay index 9bdf0584c32..d43209179f7 100644 --- a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay +++ b/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay @@ -22,7 +22,7 @@ zephyr,gain = "ADC_GAIN_1_4"; zephyr,reference = "ADC_REF_INTERNAL"; zephyr,acquisition-time = ; - zephyr,resolution = <13>; + zephyr,resolution = <12>; }; }; @@ -36,6 +36,6 @@ zephyr,gain = "ADC_GAIN_1_4"; zephyr,reference = "ADC_REF_INTERNAL"; zephyr,acquisition-time = ; - zephyr,resolution = <13>; + zephyr,resolution = <12>; }; }; From f11ec7a80864e9e2fe20306e3d7ed174c3079084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 6 Mar 2025 09:57:20 +0100 Subject: [PATCH 5/8] [nrf fromtree] boards: esp32c3: remove invalid adc1 entry. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove ADC2 support (identified as adc1 entry) for additional ESP32-C3 based board targets. Other boards have those instances already deleted. Signed-off-by: Sylvio Alves Signed-off-by: Sebastian Głąb (cherry picked from commit 40b474c0cff87112a1f0b09a014f7e37e298f82d) --- .../adc/adc_dt/boards/esp32c3_devkitm.overlay | 18 +----------------- .../adc_dt/boards/esp32c3_luatos_core.overlay | 18 +----------------- .../esp32c3_luatos_core_esp32c3_usb.overlay | 18 +----------------- 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay b/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay index d43209179f7..272d0d7bcd9 100644 --- a/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay +++ b/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay @@ -6,9 +6,7 @@ / { zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; + io-channels = <&adc0 0>; }; }; @@ -25,17 +23,3 @@ zephyr,resolution = <12>; }; }; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay index d43209179f7..272d0d7bcd9 100644 --- a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay +++ b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay @@ -6,9 +6,7 @@ / { zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; + io-channels = <&adc0 0>; }; }; @@ -25,17 +23,3 @@ zephyr,resolution = <12>; }; }; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay index d43209179f7..272d0d7bcd9 100644 --- a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ b/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay @@ -6,9 +6,7 @@ / { zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; + io-channels = <&adc0 0>; }; }; @@ -25,17 +23,3 @@ zephyr,resolution = <12>; }; }; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; From 270b56e2cb3db7916f5fbb2149e67c3f5f08bc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 6 Mar 2025 10:37:50 +0100 Subject: [PATCH 6/8] [nrf fromtree] samples: drivers: counter: add nRF54L09 config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added build configuration for nRF54L09. Signed-off-by: Rafał Kuźnia Signed-off-by: Sebastian Głąb (cherry picked from commit 5064401742513aa93f09f43533c842be32b9fe9f) --- .../alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay diff --git a/samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay new file mode 100644 index 00000000000..0847233437b --- /dev/null +++ b/samples/drivers/counter/alarm/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay @@ -0,0 +1,9 @@ +/ { + chosen { + counter = &timer24; + }; +}; + +&timer24 { + status = "okay"; +}; From 34147ff77ed38ef57a2557878088333cc23d042e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 6 Mar 2025 09:17:00 +0100 Subject: [PATCH 7/8] [nrf fromtree] samples: Simplify ESP32 overlays moving to socs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move overlays and conf from boards to socs in following samples : - samples/drivers/adc/adc_dt - samples/drivers/counter/alarm - samples/drivers/dac - samples/subsys/settings Signed-off-by: Marek Matej add more samples Signed-off-by: Marek Matej Signed-off-by: Sebastian Głąb (cherry picked from commit b58c424946c6c0d3f03b98f6d94b76d7b854b83e) --- .../boards/esp32_devkitc_wroom_procpu.overlay | 41 ------------------- .../esp32_devkitc_wrover_procpu.overlay | 41 ------------------- .../adc/adc_dt/boards/esp32s2_saola.overlay | 41 ------------------- .../boards/esp32s3_devkitm_procpu.overlay | 41 ------------------- .../boards/esp32s3_luatos_core_procpu.overlay | 41 ------------------- .../esp32s3_luatos_core_procpu_usb.overlay | 41 ------------------- .../adc_dt/boards/xiao_esp32s3_procpu.overlay | 41 ------------------- .../adc/adc_dt/boards/yd_esp32_procpu.overlay | 41 ------------------- .../esp32_procpu.overlay} | 0 .../esp32c3.overlay} | 0 .../esp32s2.overlay} | 0 .../esp32s3_procpu.overlay} | 3 +- .../boards/esp32s3_luatos_core_procpu.overlay | 3 -- .../esp32s3_luatos_core_procpu_usb.overlay | 3 -- .../alarm/boards/yd_esp32_procpu.overlay | 3 -- .../esp32_procpu.overlay} | 0 .../esp32s2.overlay} | 0 .../esp32s3_procpu.overlay} | 0 .../drivers/dac/boards/esp32s2_saola.overlay | 17 -------- .../dac/boards/yd_esp32_procpu.overlay | 17 -------- .../esp32_procpu.overlay} | 0 .../esp32s2.overlay} | 0 .../esp32s3_luatos_core_procpu_usb.conf | 4 -- .../esp32_procpu.conf} | 0 .../esp32s2_saola.conf => socs/esp32c6.conf} | 0 .../esp32s2.conf} | 0 .../esp32s3_procpu.conf} | 0 27 files changed, 2 insertions(+), 376 deletions(-) delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay delete mode 100644 samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay delete mode 100644 samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay delete mode 100644 samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay rename samples/drivers/adc/adc_dt/{boards/esp32c3_devkitm.overlay => socs/esp32_procpu.overlay} (100%) rename samples/drivers/adc/adc_dt/{boards/esp32c3_luatos_core.overlay => socs/esp32c3.overlay} (100%) rename samples/drivers/adc/adc_dt/{boards/esp32c3_luatos_core_esp32c3_usb.overlay => socs/esp32s2.overlay} (100%) rename samples/drivers/adc/adc_dt/{boards/esp32s3_touch_lcd_1_28.overlay => socs/esp32s3_procpu.overlay} (87%) delete mode 100644 samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay delete mode 100644 samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay delete mode 100644 samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay rename samples/drivers/counter/alarm/{boards/esp32_devkitc_wroom_procpu.overlay => socs/esp32_procpu.overlay} (100%) rename samples/drivers/counter/alarm/{boards/esp32s2_saola.overlay => socs/esp32s2.overlay} (100%) rename samples/drivers/counter/alarm/{boards/esp32s3_devkitm_procpu.overlay => socs/esp32s3_procpu.overlay} (100%) delete mode 100644 samples/drivers/dac/boards/esp32s2_saola.overlay delete mode 100644 samples/drivers/dac/boards/yd_esp32_procpu.overlay rename samples/drivers/dac/{boards/esp32_devkitc_wroom_procpu.overlay => socs/esp32_procpu.overlay} (100%) rename samples/drivers/dac/{boards/esp32_devkitc_wrover_procpu.overlay => socs/esp32s2.overlay} (100%) delete mode 100644 samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf rename samples/subsys/settings/{boards/esp32_devkitc_wroom_procpu.conf => socs/esp32_procpu.conf} (100%) rename samples/subsys/settings/{boards/esp32s2_saola.conf => socs/esp32c6.conf} (100%) rename samples/subsys/settings/{boards/esp32s3_devkitm_procpu.conf => socs/esp32s2.conf} (100%) rename samples/subsys/settings/{boards/esp32s3_luatos_core_procpu.conf => socs/esp32s3_procpu.conf} (100%) diff --git a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wroom_procpu.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/esp32_devkitc_wrover_procpu.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay b/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/esp32s2_saola.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/esp32s3_devkitm_procpu.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay b/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay b/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/esp32s3_luatos_core_procpu_usb.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay b/samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/xiao_esp32s3_procpu.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay b/samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay deleted file mode 100644 index d43209179f7..00000000000 --- a/samples/drivers/adc/adc_dt/boards/yd_esp32_procpu.overlay +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - io-channels = - <&adc0 0>, - <&adc1 0>; - }; -}; - -&adc0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; - -&adc1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1_4"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay b/samples/drivers/adc/adc_dt/socs/esp32_procpu.overlay similarity index 100% rename from samples/drivers/adc/adc_dt/boards/esp32c3_devkitm.overlay rename to samples/drivers/adc/adc_dt/socs/esp32_procpu.overlay diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay b/samples/drivers/adc/adc_dt/socs/esp32c3.overlay similarity index 100% rename from samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core.overlay rename to samples/drivers/adc/adc_dt/socs/esp32c3.overlay diff --git a/samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/samples/drivers/adc/adc_dt/socs/esp32s2.overlay similarity index 100% rename from samples/drivers/adc/adc_dt/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename to samples/drivers/adc/adc_dt/socs/esp32s2.overlay diff --git a/samples/drivers/adc/adc_dt/boards/esp32s3_touch_lcd_1_28.overlay b/samples/drivers/adc/adc_dt/socs/esp32s3_procpu.overlay similarity index 87% rename from samples/drivers/adc/adc_dt/boards/esp32s3_touch_lcd_1_28.overlay rename to samples/drivers/adc/adc_dt/socs/esp32s3_procpu.overlay index de057062019..272d0d7bcd9 100644 --- a/samples/drivers/adc/adc_dt/boards/esp32s3_touch_lcd_1_28.overlay +++ b/samples/drivers/adc/adc_dt/socs/esp32s3_procpu.overlay @@ -1,5 +1,6 @@ /* - * Copyright (c) 2024 Joel Guittet + * Copyright (c) 2022 Wolter HV + * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay b/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay deleted file mode 100644 index 241947b0643..00000000000 --- a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&timer0 { - status = "okay"; -}; diff --git a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay b/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay deleted file mode 100644 index 241947b0643..00000000000 --- a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&timer0 { - status = "okay"; -}; diff --git a/samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay b/samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay deleted file mode 100644 index 241947b0643..00000000000 --- a/samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&timer0 { - status = "okay"; -}; diff --git a/samples/drivers/counter/alarm/boards/esp32_devkitc_wroom_procpu.overlay b/samples/drivers/counter/alarm/socs/esp32_procpu.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32_devkitc_wroom_procpu.overlay rename to samples/drivers/counter/alarm/socs/esp32_procpu.overlay diff --git a/samples/drivers/counter/alarm/boards/esp32s2_saola.overlay b/samples/drivers/counter/alarm/socs/esp32s2.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32s2_saola.overlay rename to samples/drivers/counter/alarm/socs/esp32s2.overlay diff --git a/samples/drivers/counter/alarm/boards/esp32s3_devkitm_procpu.overlay b/samples/drivers/counter/alarm/socs/esp32s3_procpu.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32s3_devkitm_procpu.overlay rename to samples/drivers/counter/alarm/socs/esp32s3_procpu.overlay diff --git a/samples/drivers/dac/boards/esp32s2_saola.overlay b/samples/drivers/dac/boards/esp32s2_saola.overlay deleted file mode 100644 index 4bb2651bd68..00000000000 --- a/samples/drivers/dac/boards/esp32s2_saola.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2022 Espressif (Shanghai) - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - dac = <&dac>; - dac-channel-id = <0>; - dac-resolution = <8>; - }; -}; - -&dac { - status = "okay"; -}; diff --git a/samples/drivers/dac/boards/yd_esp32_procpu.overlay b/samples/drivers/dac/boards/yd_esp32_procpu.overlay deleted file mode 100644 index 4bb2651bd68..00000000000 --- a/samples/drivers/dac/boards/yd_esp32_procpu.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2022 Espressif (Shanghai) - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - dac = <&dac>; - dac-channel-id = <0>; - dac-resolution = <8>; - }; -}; - -&dac { - status = "okay"; -}; diff --git a/samples/drivers/dac/boards/esp32_devkitc_wroom_procpu.overlay b/samples/drivers/dac/socs/esp32_procpu.overlay similarity index 100% rename from samples/drivers/dac/boards/esp32_devkitc_wroom_procpu.overlay rename to samples/drivers/dac/socs/esp32_procpu.overlay diff --git a/samples/drivers/dac/boards/esp32_devkitc_wrover_procpu.overlay b/samples/drivers/dac/socs/esp32s2.overlay similarity index 100% rename from samples/drivers/dac/boards/esp32_devkitc_wrover_procpu.overlay rename to samples/drivers/dac/socs/esp32s2.overlay diff --git a/samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf b/samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf deleted file mode 100644 index 498fb072287..00000000000 --- a/samples/subsys/settings/boards/esp32s3_luatos_core_procpu_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/boards/esp32_devkitc_wroom_procpu.conf b/samples/subsys/settings/socs/esp32_procpu.conf similarity index 100% rename from samples/subsys/settings/boards/esp32_devkitc_wroom_procpu.conf rename to samples/subsys/settings/socs/esp32_procpu.conf diff --git a/samples/subsys/settings/boards/esp32s2_saola.conf b/samples/subsys/settings/socs/esp32c6.conf similarity index 100% rename from samples/subsys/settings/boards/esp32s2_saola.conf rename to samples/subsys/settings/socs/esp32c6.conf diff --git a/samples/subsys/settings/boards/esp32s3_devkitm_procpu.conf b/samples/subsys/settings/socs/esp32s2.conf similarity index 100% rename from samples/subsys/settings/boards/esp32s3_devkitm_procpu.conf rename to samples/subsys/settings/socs/esp32s2.conf diff --git a/samples/subsys/settings/boards/esp32s3_luatos_core_procpu.conf b/samples/subsys/settings/socs/esp32s3_procpu.conf similarity index 100% rename from samples/subsys/settings/boards/esp32s3_luatos_core_procpu.conf rename to samples/subsys/settings/socs/esp32s3_procpu.conf From 333e325de6f12f160f31fb008836344995f11a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Wed, 18 Dec 2024 14:14:56 +0100 Subject: [PATCH 8/8] [nrf fromtree] samples: settings: cleanup and use filters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sebastian Głąb (cherry picked from commit 270c4e4cab4a6282816b4f4d312eba52f945aee2) --- .../settings/boards/mimxrt1020_evk.conf | 2 -- .../subsys/settings/boards/mr_canhubk3.conf | 8 ------- .../subsys/settings/boards/native_sim.conf | 5 ----- .../subsys/settings/boards/native_sim.overlay | 22 ------------------- .../settings/boards/native_sim_native_64.conf | 5 ----- .../boards/native_sim_native_64.overlay | 7 ------ .../settings/boards/nrf52840dk_nrf52840.conf | 3 --- .../settings/boards/nrf52dk_nrf52832.conf | 3 --- .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 -- .../boards/nrf54l15dk_nrf54l05_cpuapp.conf | 2 -- .../boards/nrf54l15dk_nrf54l10_cpuapp.conf | 2 -- .../boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- samples/subsys/settings/boards/qemu_x86.conf | 2 -- .../boards/s32z2xxdc2_s32z270_rtu0.conf | 5 ----- .../boards/s32z2xxdc2_s32z270_rtu1.conf | 5 ----- .../settings/boards/yd_esp32_procpu.conf | 4 ---- samples/subsys/settings/prj.conf | 5 ++++- samples/subsys/settings/sample.yaml | 16 +++----------- samples/subsys/settings/socs/cc1352p7.conf | 1 - .../subsys/settings/socs/esp32_procpu.conf | 4 ---- samples/subsys/settings/socs/esp32c3.conf | 4 ---- samples/subsys/settings/socs/esp32c3_usb.conf | 4 ---- samples/subsys/settings/socs/esp32c6.conf | 4 ---- samples/subsys/settings/socs/esp32s2.conf | 4 ---- .../subsys/settings/socs/esp32s3_procpu.conf | 4 ---- 25 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 samples/subsys/settings/boards/mimxrt1020_evk.conf delete mode 100644 samples/subsys/settings/boards/mr_canhubk3.conf delete mode 100644 samples/subsys/settings/boards/native_sim.conf delete mode 100644 samples/subsys/settings/boards/native_sim.overlay delete mode 100644 samples/subsys/settings/boards/native_sim_native_64.conf delete mode 100644 samples/subsys/settings/boards/native_sim_native_64.overlay delete mode 100644 samples/subsys/settings/boards/nrf52840dk_nrf52840.conf delete mode 100644 samples/subsys/settings/boards/nrf52dk_nrf52832.conf delete mode 100644 samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf delete mode 100644 samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf delete mode 100644 samples/subsys/settings/boards/qemu_x86.conf delete mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf delete mode 100644 samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf delete mode 100644 samples/subsys/settings/boards/yd_esp32_procpu.conf delete mode 100644 samples/subsys/settings/socs/cc1352p7.conf delete mode 100644 samples/subsys/settings/socs/esp32_procpu.conf delete mode 100644 samples/subsys/settings/socs/esp32c3.conf delete mode 100644 samples/subsys/settings/socs/esp32c3_usb.conf delete mode 100644 samples/subsys/settings/socs/esp32c6.conf delete mode 100644 samples/subsys/settings/socs/esp32s2.conf delete mode 100644 samples/subsys/settings/socs/esp32s3_procpu.conf diff --git a/samples/subsys/settings/boards/mimxrt1020_evk.conf b/samples/subsys/settings/boards/mimxrt1020_evk.conf deleted file mode 100644 index 3746c13c741..00000000000 --- 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 6ca210a81ac..00000000000 --- 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 21877f886f3..00000000000 --- 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 0e4839ad026..00000000000 --- 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 21877f886f3..00000000000 --- 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 e4994493dd6..00000000000 --- 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 248bc56424e..00000000000 --- 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 248bc56424e..00000000000 --- 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 3746c13c741..00000000000 --- 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 3746c13c741..00000000000 --- 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 3746c13c741..00000000000 --- 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 3746c13c741..00000000000 --- 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 3746c13c741..00000000000 --- 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 1535e4d46cd..00000000000 --- 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 1535e4d46cd..00000000000 --- 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 498fb072287..00000000000 --- 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 25c66253846..d9ae787141a 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 aafc61e555e..7dcf6c45720 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 ca92a061c6a..00000000000 --- 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 498fb072287..00000000000 --- 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 498fb072287..00000000000 --- 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 498fb072287..00000000000 --- 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 498fb072287..00000000000 --- 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 498fb072287..00000000000 --- 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 498fb072287..00000000000 --- 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