soc: riscv: telink_b9x: Auto calculation of SETTINGS_NVS_SECTOR_COUNT

- Set the sector count of NVS as the storage partition size divided by the sector size (4 KB) Signed-off-by: Borys Nykytiuk <[email protected]>
telink-semi · Aug 13, 2024 · ba02c5d · ba02c5d
1 parent 585f52b
commit ba02c5d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/boards/riscv/tlsr9118bdk40d/tlsr9118bdk40d-common.dtsi b/boards/riscv/tlsr9118bdk40d/tlsr9118bdk40d-common.dtsi
@@ -65,7 +65,6 @@
 		telink,ipc-interface = &ipc0;
 		zephyr,entropy = &trng0;
 		zephyr,code-partition = &slot0_partition;
-		zephyr,storage-partition = &storage_partition;
 	};
 };
 

diff --git a/soc/riscv/riscv-privilege/telink_b9x/Kconfig.defconfig.series b/soc/riscv/riscv-privilege/telink_b9x/Kconfig.defconfig.series
@@ -79,6 +79,13 @@ config COMMON_LIBC_MALLOC
 config COMMON_LIBC_MALLOC_ARENA_SIZE
 	default 8192
 
+# Workaround for not being able to have commas in macro arguments
+DT_LABEL_Z_STORAGE := $(dt_nodelabel_path,storage_partition)
+
+# Set the sector count of NVS as the storage partition size divided by the sector size (4 KB)
+config SETTINGS_NVS_SECTOR_COUNT
+	default $(shell,expr $(dt_node_reg_size_int,$(DT_LABEL_Z_STORAGE),0,K) / 4)
+
 config OPENTHREAD_RADIO_WORKQUEUE_STACK_SIZE
 	default 2048 if NET_L2_OPENTHREAD && NETWORKING
 

diff --git a/soc/riscv/riscv-privilege/telink_w91/Kconfig.defconfig.series b/soc/riscv/riscv-privilege/telink_w91/Kconfig.defconfig.series
@@ -67,11 +67,12 @@ config COMMON_LIBC_MALLOC_ARENA_SIZE
 	default 8192
 
 # Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_STORAGE := zephyr,storage-partition
+DT_LABEL_Z_STORAGE := $(dt_nodelabel_path,storage_partition)
 
 # Set the sector count of NVS as the storage partition size divided by the sector size (4 KB)
 config SETTINGS_NVS_SECTOR_COUNT
-    default $(shell,expr $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_STORAGE),0,K) / 4)
+	default $(shell,expr $(dt_node_reg_size_int,$(DT_LABEL_Z_STORAGE),0,K) / 4)
+
 
 config OPENTHREAD_RADIO_WORKQUEUE_STACK_SIZE
 	default 2048 if NET_L2_OPENTHREAD && NETWORKING