soc: silabs: siwx917: support flash code-partition

A specific section of the flash on the SiWx917 is reserved for the Network co-processor (nwp). This zone needs to be delimited in order to not overwrite it. We then need to use "code-partition" to provide Zephyr the application code flash location. Signed-off-by: Martin Hoff <[email protected]>
SiliconLabsSoftware · Nov 14, 2024 · 4a274c8 · 4a274c8
1 parent 33169fe
commit 4a274c8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.dts b/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.dts
@@ -17,6 +17,7 @@
 
 	chosen {
 		zephyr,sram = &sram0;
+		zephyr,code-partition = &slot0_partition;
 		zephyr,console = &ulpuart0;
 		zephyr,shell-uart = &ulpuart0;
 		zephyr,bt-hci = &bt_hci_silabs_siwx917;
@@ -96,3 +97,22 @@
 		};
 	};
 };
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		// NWP (Network Processor) partition (do not overwrite)
+		nwp_firmware_partition: partition@0 {
+			label = "nwp_firmware";
+			reg = <0x0000000 DT_SIZE_K(8)>;
+		};
+
+		slot0_partition: partition@2000 {
+			label = "slot0";
+			reg = <0x0002000 DT_SIZE_K(2048-8)>;
+		};
+	};
+};
diff --git a/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a_defconfig b/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a_defconfig
@@ -7,3 +7,4 @@ CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_PINCTRL=y
 CONFIG_SIWX917_FLASH_MODE_COMMON=y
+CONFIG_USE_DT_CODE_PARTITION=y
diff --git a/dts/arm/silabs/siwg917.dtsi b/dts/arm/silabs/siwg917.dtsi
@@ -52,9 +52,9 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			flash0: flash@8202000 {
+			flash0: flash@8200000 {
 				compatible = "soc-nv-flash";
-				reg = <0x8202000 DT_SIZE_K(2040)>;
+				reg = <0x8200000 DT_SIZE_K(2048)>;
 				write-block-size = <1>;
 				erase-block-size = <4096>;
 			};

diff --git a/soc/silabs/silabs_siwx917/CMakeLists.txt b/soc/silabs/silabs_siwx917/CMakeLists.txt
@@ -3,9 +3,12 @@
 
 add_subdirectory(siwg917)
 
+# Necessary to not overwrite NWP Firmware
+math(EXPR FLASH_LOAD_ADDRESS "(${CONFIG_FLASH_BASE_ADDRESS}) + (${CONFIG_FLASH_LOAD_OFFSET})")
+
 set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/siwx917_isp_prepare.py
-    --rom_addr ${CONFIG_FLASH_BASE_ADDRESS}
+    --rom_addr ${FLASH_LOAD_ADDRESS}
     ${KERNEL_BIN_NAME}
     ${KERNEL_BIN_NAME}.rps
 )