From f5929148bcaeb1952f811f522e50ce8701354884 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Tue, 30 Sep 2025 09:08:46 -0500 Subject: [PATCH] samples: subsys: nvs: stm32 overlays fixup. Don't try to delete storage partitions that doesn't exist anymore --- .../b-ld/boards/nucleo_f429zi.overlay | 20 +++++++++---------- .../b-ls/boards/nucleo_f429zi.overlay | 20 +++++++++---------- .../b-sa/boards/nucleo_f429zi.overlay | 20 +++++++++---------- .../b-ss/boards/nucleo_f429zi.overlay | 2 -- 4 files changed, 27 insertions(+), 35 deletions(-) diff --git a/zephyr/samples/profiles/b-ld/boards/nucleo_f429zi.overlay b/zephyr/samples/profiles/b-ld/boards/nucleo_f429zi.overlay index bf5a3ad..317942d 100644 --- a/zephyr/samples/profiles/b-ld/boards/nucleo_f429zi.overlay +++ b/zephyr/samples/profiles/b-ld/boards/nucleo_f429zi.overlay @@ -4,16 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -/delete-node/ &storage_partition; - &flash0 { - partitions { - /* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K - * (nvs.h: uint16_t sector_size) - */ - storage_partition: partition@100000 { - label = "storage"; - reg = <0x000100000 DT_SIZE_K(48)>; - }; - }; + partitions { + /* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K + * (nvs.h: uint16_t sector_size) + */ + storage_partition: partition@100000 { + label = "storage"; + reg = <0x000100000 DT_SIZE_K(48)>; + }; + }; }; diff --git a/zephyr/samples/profiles/b-ls/boards/nucleo_f429zi.overlay b/zephyr/samples/profiles/b-ls/boards/nucleo_f429zi.overlay index bf5a3ad..317942d 100644 --- a/zephyr/samples/profiles/b-ls/boards/nucleo_f429zi.overlay +++ b/zephyr/samples/profiles/b-ls/boards/nucleo_f429zi.overlay @@ -4,16 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -/delete-node/ &storage_partition; - &flash0 { - partitions { - /* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K - * (nvs.h: uint16_t sector_size) - */ - storage_partition: partition@100000 { - label = "storage"; - reg = <0x000100000 DT_SIZE_K(48)>; - }; - }; + partitions { + /* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K + * (nvs.h: uint16_t sector_size) + */ + storage_partition: partition@100000 { + label = "storage"; + reg = <0x000100000 DT_SIZE_K(48)>; + }; + }; }; diff --git a/zephyr/samples/profiles/b-sa/boards/nucleo_f429zi.overlay b/zephyr/samples/profiles/b-sa/boards/nucleo_f429zi.overlay index bf5a3ad..317942d 100644 --- a/zephyr/samples/profiles/b-sa/boards/nucleo_f429zi.overlay +++ b/zephyr/samples/profiles/b-sa/boards/nucleo_f429zi.overlay @@ -4,16 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -/delete-node/ &storage_partition; - &flash0 { - partitions { - /* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K - * (nvs.h: uint16_t sector_size) - */ - storage_partition: partition@100000 { - label = "storage"; - reg = <0x000100000 DT_SIZE_K(48)>; - }; - }; + partitions { + /* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K + * (nvs.h: uint16_t sector_size) + */ + storage_partition: partition@100000 { + label = "storage"; + reg = <0x000100000 DT_SIZE_K(48)>; + }; + }; }; diff --git a/zephyr/samples/profiles/b-ss/boards/nucleo_f429zi.overlay b/zephyr/samples/profiles/b-ss/boards/nucleo_f429zi.overlay index 4d93314..687a23c 100644 --- a/zephyr/samples/profiles/b-ss/boards/nucleo_f429zi.overlay +++ b/zephyr/samples/profiles/b-ss/boards/nucleo_f429zi.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -/delete-node/ &storage_partition; - &flash0 { partitions { /* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K