samples: tfm_integration: adapt DTS overlays for STM32L562 board

Due to changes in flash_layout.h for STM32L562, in the current TF-M module update, we need to modify the DTS overlay files in the TF-M samples where the board is supported. Signed-off-by: Ioannis Glaropoulos <[email protected]>
grevaillot · Jul 28, 2021 · 3843bf6 · 3843bf6
1 parent 08510d5
commit 3843bf6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/samples/tfm_integration/psa_crypto/boards/stm32l562e_dk_ns.overlay b/samples/tfm_integration/psa_crypto/boards/stm32l562e_dk_ns.overlay
@@ -33,12 +33,12 @@
 		/* Secure image primary slot */
 		slot0_partition: partition@19000 {
 			label = "image-0";
-			reg = <0x00019000 0x00038000>;
+			reg = <0x00019000 0x0003C000>;
 		};
 		/* Non-secure image primary slot */
-		slot1_partition: partition@51000 {
+		slot1_partition: partition@55000 {
 			label = "image-1";
-			reg = <0x00051000 0x0002A000>;
+			reg = <0x00055000 0x0002A000>;
 		};
 		/*
 		 * The flash starting at 0x7F000 and ending at

diff --git a/samples/tfm_integration/tfm_ipc/boards/stm32l562e_dk_ns.overlay b/samples/tfm_integration/tfm_ipc/boards/stm32l562e_dk_ns.overlay
@@ -6,14 +6,13 @@
 
  /* This partition table should be used along with TFM configuration:
   * - TEST_S=OFF (NO REGRESSION)
-  * - TFM_PSA_API=ON (IPC)
   *
   * In this configuration, TFM binary does not include tests.
   * The partition sizes are compatible with the TF-M platform
   * flash_layout.h.
   */
 
-/ {
+  / {
 	chosen {
 		zephyr,code-partition = &slot1_partition;
 	};
@@ -34,12 +33,12 @@
 		/* Secure image primary slot */
 		slot0_partition: partition@19000 {
 			label = "image-0";
-			reg = <0x00019000 0x00038000>;
+			reg = <0x00019000 0x0003C000>;
 		};
 		/* Non-secure image primary slot */
-		slot1_partition: partition@51000 {
+		slot1_partition: partition@55000 {
 			label = "image-1";
-			reg = <0x00051000 0x0002A000>;
+			reg = <0x00055000 0x0002A000>;
 		};
 		/*
 		 * The flash starting at 0x7F000 and ending at

diff --git a/tests/arch/arm/arm_thread_swap_tz/boards/stm32l562e_dk_ns.overlay b/tests/arch/arm/arm_thread_swap_tz/boards/stm32l562e_dk_ns.overlay
@@ -8,10 +8,11 @@
   * - TEST_S=OFF (NO REGRESSION)
   *
   * In this configuration, TFM binary does not include tests.
-  * The partition sizes are compatible with TF-M platform flash_layout.h.
+  * The partition sizes are compatible with the TF-M platform
+  * flash_layout.h.
   */
 
-/ {
+  / {
 	chosen {
 		zephyr,code-partition = &slot1_partition;
 	};
@@ -30,20 +31,20 @@
 			read-only;
 		};
 		/* Secure image primary slot */
-		slot0_partition: partition@00019000 {
+		slot0_partition: partition@19000 {
 			label = "image-0";
-			reg = <0x00019000 0x00038000>;
+			reg = <0x00019000 0x0003C000>;
 		};
 		/* Non-secure image primary slot */
-		slot1_partition: partition@00051000 {
+		slot1_partition: partition@55000 {
 			label = "image-1";
-			reg = <0x00051000 0x0002A000>;
+			reg = <0x00055000 0x0002A000>;
 		};
 		/*
 		 * The flash starting at 0x7F000 and ending at
 		 * 0x80000 is reserved for the application.
 		 */
-		storage_partition: partition@7F000 {
+		storage_partition: partition@7f000 {
 			label = "storage";
 			reg = <0x0007F000 0x00001000>;
 		};