TF-M (2.2.2) upmerge 2025.12.12

MAINTAINERS.yml

@@ -5803,20 +5803,6 @@ West:
   labels:
     - "area: Debugging"
 
-"West project: sof":
-  status: maintained
-  maintainers:
-    - kv2019i
-  collaborators:
-    - andyross
-    - nashif
-    - lyakh
-    - lgirdwood
-  files:
-    - modules/Kconfig.sof
-  labels:
-    - "area: Audio"
-
 "West project: tf-m-tests":
   status: maintained
   maintainers:

boards/adi/max32658evkit/Kconfig.defconfig

@@ -0,0 +1,48 @@
+# Copyright (c) 2024-2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_MAX32658EVKIT
+
+# Code Partition:
+#
+# For the secure version of the board the firmware is linked at the beginning
+# of the flash, or into the code-partition defined in DT if it is intended to
+# be loaded by MCUboot. If the secure firmware is to be combined with a non-
+# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
+# be restricted to the size of its code partition.
+#
+# For the non-secure version of the board, the firmware
+# must be linked into the code-partition (non-secure) defined in DT, regardless.
+# Apply this configuration below by setting the Kconfig symbols used by
+# the linker according to the information extracted from DT partitions.
+
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+if BOARD_MAX32658EVKIT_MAX32658_NS
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+# MAX32658 has one UART interface,
+# It can be used either on TFM or Zephyr
+# Enabling debug (TFM_SPM_LOG_LEVEL || TFM_PARTITION_LOG_LEVEL) will transfer it to the TFM side
+# Disabling TFM debug will transfer it to the Zephyr side.
+
+choice TFM_SPM_LOG_LEVEL
+	default TFM_SPM_LOG_LEVEL_SILENCE
+endchoice
+
+choice TFM_PARTITION_LOG_LEVEL
+	default TFM_PARTITION_LOG_LEVEL_SILENCE
+endchoice
+
+endif # BOARD_MAX32658EVKIT_MAX32658_NS
+
+config I3C
+	default y if ADXL367
+
+endif # BOARD_MAX32658EVKIT

boards/adi/max32658evkit/Kconfig.max32658evkit

@@ -0,0 +1,6 @@
+# Copyright (c) 2024-2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MAX32658EVKIT
+	select SOC_MAX32658 if BOARD_MAX32658EVKIT_MAX32658 ||	\
+			       BOARD_MAX32658EVKIT_MAX32658_NS

boards/adi/max32658evkit/board.cmake

@@ -0,0 +1,12 @@
+# Copyright (c) 2024-2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_BOARD_MAX32658EVKIT_MAX32658_NS)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
+endif()
+
+board_runner_args(jlink "--device=MAX32658" "--reset-after-load")
+
+include(${ZEPHYR_BASE}/boards/common/openocd-adi-max32.boards.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/adi/max32658evkit/board.yml

@@ -0,0 +1,10 @@
+# Copyright (c) 2024-2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board:
+  name: max32658evkit
+  vendor: adi
+  socs:
+  - name: max32658
+    variants:
+    - name: "ns"

boards/adi/max32658evkit/max32658evkit_max32658.dts

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2024-2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <adi/max32/max32657.dtsi>
+#include "max32658evkit_max32658_common.dtsi"
+
+/ {
+	 chosen {
+		 zephyr,sram = &secure_ram;
+		 zephyr,flash = &flash0;
+		 zephyr,code-partition = &slot0_partition;
+	 };
+
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		secure_ram: partition@30000000 {
+			label = "secure-memory";
+			reg = <0x30000000 DT_SIZE_K(256)>;
+		};
+	};
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot0_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(960)>;
+			read-only;
+		};
+
+		storage_partition: partition@f0000 {
+			label = "storage";
+			reg = <0xf0000 DT_SIZE_K(64)>;
+		};
+	};
+};
+
+&trng {
+	status = "okay";
+};

boards/adi/max32658evkit/max32658evkit_max32658.yaml

@@ -0,0 +1,21 @@
+identifier: max32658evkit/max32658
+name: max32658evkit-max32658
+vendor: adi
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - serial
+  - gpio
+  - trng
+  - watchdog
+  - dma
+  - counter
+  - pwm
+  - rtc_counter
+  - spi
+  - i3c
+ram: 256
+flash: 960

boards/adi/max32658evkit/max32658evkit_max32658_common.dtsi

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2024-2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <adi/max32/max32657-pinctrl.dtsi>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/gpio/adi-max32-gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Analog Devices MAX32658EVKIT";
+	compatible = "adi,max32658evkit";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,cortex-m-idle-timer = &counter_wut1;
+		zephyr,shell-uart = &uart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led_1 {
+			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+			label = "Green LED";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		pb1: pb1 {
+			gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW2";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		accel0 = &adxl367;
+		led0 = &led1;
+		sw0 = &pb1;
+		watchdog0 = &wdt0;
+	};
+};
+
+&uart0 {
+	pinctrl-0 = <&uart0_tx_p0_9 &uart0_rx_p0_5>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	data-bits = <8>;
+	parity = "none";
+	status = "okay";
+};
+
+&clk_ipo {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+	pinctrl-0 = <&spi0_mosi_p0_2 &spi0_miso_p0_4 &spi0_sck_p0_6 &spi0_ss0_p0_3>;
+	pinctrl-names = "default";
+};
+
+&rtc_counter {
+	status = "okay";
+	clock-source = <ADI_MAX32_PRPH_CLK_SRC_INRO>;
+};
+
+&i3c0 {
+	status = "okay";
+	pinctrl-0  = <&i3c_scl_p0_0 &i3c_sda_p0_1>;
+	pinctrl-names = "default";
+	i2c-scl-hz = <DT_FREQ_K(200)>;
+	i3c-scl-hz = <DT_FREQ_K(800)>;
+	i3c-od-scl-hz = <DT_FREQ_K(400)>;
+
+	adxl367: adxl367@530000000000000000 {
+		compatible = "adi,adxl367";
+		reg = <0x53 0x00 0x00>;
+		status = "okay";
+	};
+};
+
+&wut0 {
+	clock-source = <ADI_MAX32_PRPH_CLK_SRC_INRO>;
+};
+
+&wut1 {
+	status = "okay";
+	clock-source = <ADI_MAX32_PRPH_CLK_SRC_INRO>;
+	wakeup-source;
+	counter_wut1: counter {
+		status = "okay";
+	};
+};

boards/adi/max32658evkit/max32658evkit_max32658_defconfig

@@ -0,0 +1,16 @@
+# Copyright (c) 2024-2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable UART
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# It is secure fw, enable flags
+CONFIG_TRUSTED_EXECUTION_SECURE=y

boards/adi/max32658evkit/max32658evkit_max32658_ns.dts

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024-2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <adi/max32/max32657_ns.dtsi>
+#include "max32658evkit_max32658_common.dtsi"
+
+/ {
+	 chosen {
+		zephyr,sram = &non_secure_ram;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+	 };
+
+	 reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		/* RAM split used by TFM */
+		secure_ram: partition@20000000 {
+			label = "secure-memory";
+			reg = <0x20000000 DT_SIZE_K(64)>;
+		};
+
+		non_secure_ram: partition@20010000 {
+			label = "non-secure-memory";
+			reg = <0x20010000 DT_SIZE_K(192)>;
+		};
+	};
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+			read-only;
+		};
+
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(320)>;
+		};
+
+		slot0_ns_partition: partition@60000 {
+			label = "image-0-nonsecure";
+			reg = <0x60000 DT_SIZE_K(576)>;
+		};
+
+		/*
+		 * slot1_partition: partition@f0000 {
+		 *  label = "image-1";
+		 *	reg = <0xf0000 DT_SIZE_K(0)>;
+		 * };
+		 * slot1_ns_partition: partition@f0000 {
+		 *	label = "image-1-nonsecure";
+		 *	reg = <0xf0000 DT_SIZE_K(0)>;
+		 * };
+		 */
+
+		storage_partition: partition@f0000 {
+			label = "storage";
+			reg = <0xf0000 DT_SIZE_K(64)>;
+		};
+	};
+};

boards/adi/max32658evkit/max32658evkit_max32658_ns.yaml

@@ -0,0 +1,20 @@
+identifier: max32658evkit/max32658/ns
+name: max32658evkit-max32658-Non-Secure
+vendor: adi
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - serial
+  - gpio
+  - watchdog
+  - dma
+  - counter
+  - pwm
+  - rtc_counter
+  - spi
+  - i3c
+ram: 192
+flash: 576