Merge branch 'main' into add_roc_rk3588

Author: kartben

CMakeLists.txt

@@ -214,24 +214,53 @@ endif()
 #    1) Using EXTRA_CFLAGS which is applied regardless of kconfig choice, or
 #    2) Rely on override support being implemented by your toolchain_cc_optimize_*()
 #
-get_property(OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET compiler PROPERTY no_optimization)
-get_property(OPTIMIZE_FOR_DEBUG_FLAG TARGET compiler PROPERTY optimization_debug)
-get_property(OPTIMIZE_FOR_SPEED_FLAG TARGET compiler PROPERTY optimization_speed)
-get_property(OPTIMIZE_FOR_SIZE_FLAG  TARGET compiler PROPERTY optimization_size)
-get_property(OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET compiler PROPERTY optimization_size_aggressive)
+get_property(COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET compiler PROPERTY no_optimization)
+get_property(COMPILER_OPTIMIZE_FOR_DEBUG_FLAG TARGET compiler PROPERTY optimization_debug)
+get_property(COMPILER_OPTIMIZE_FOR_SPEED_FLAG TARGET compiler PROPERTY optimization_speed)
+get_property(COMPILER_OPTIMIZE_FOR_SIZE_FLAG  TARGET compiler PROPERTY optimization_size)
+get_property(COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET compiler PROPERTY optimization_size_aggressive)
+
+get_property(ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET asm PROPERTY no_optimization)
+get_property(ASM_OPTIMIZE_FOR_DEBUG_FLAG TARGET asm PROPERTY optimization_debug)
+get_property(ASM_OPTIMIZE_FOR_SPEED_FLAG TARGET asm PROPERTY optimization_speed)
+get_property(ASM_OPTIMIZE_FOR_SIZE_FLAG  TARGET asm PROPERTY optimization_size)
+get_property(ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET asm PROPERTY optimization_size_aggressive)
+
+# Let the assembler inherit the optimization flags of the compiler if it is
+# not set explicitly.
+if(NOT ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG)
+  set(ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG ${COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
+endif()
+if(NOT ASM_OPTIMIZE_FOR_DEBUG_FLAG)
+  set(ASM_OPTIMIZE_FOR_DEBUG_FLAG ${COMPILER_OPTIMIZE_FOR_DEBUG_FLAG})
+endif()
+if(NOT ASM_OPTIMIZE_FOR_SPEED_FLAG)
+  set(ASM_OPTIMIZE_FOR_SPEED_FLAG ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG})
+endif()
+if(NOT ASM_OPTIMIZE_FOR_SIZE_FLAG)
+  set(ASM_OPTIMIZE_FOR_SIZE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG})
+endif()
+if(NOT ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG)
+  set(ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
+endif()
 
 # From kconfig choice, pick the actual OPTIMIZATION_FLAG to use.
 # Kconfig choice ensures only one of these CONFIG_*_OPTIMIZATIONS is set.
 if(CONFIG_NO_OPTIMIZATIONS)
-  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
+  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
+  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})
 elseif(CONFIG_DEBUG_OPTIMIZATIONS)
-  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_DEBUG_FLAG})
+  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_DEBUG_FLAG})
+  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_DEBUG_FLAG})
 elseif(CONFIG_SPEED_OPTIMIZATIONS)
-  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SPEED_FLAG})
+  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG})
+  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SPEED_FLAG})
 elseif(CONFIG_SIZE_OPTIMIZATIONS)
-  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_FLAG}) # Default in kconfig
+  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG}) # Default in kconfig
+  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SIZE_FLAG})
 elseif(CONFIG_SIZE_OPTIMIZATIONS_AGGRESSIVE)
-  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
+  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
+  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
 else()
   message(FATAL_ERROR
     "Unreachable code. Expected optimization level to have been chosen. See Kconfig.zephyr")
@@ -245,9 +274,9 @@ SOC_* symbol.")
 endif()
 
 # Apply the final optimization flag(s)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${OPTIMIZATION_FLAG}>)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${OPTIMIZATION_FLAG}>)
-zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${OPTIMIZATION_FLAG}>)
+zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${ASM_OPTIMIZATION_FLAG}>)
+zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${COMPILER_OPTIMIZATION_FLAG}>)
+zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${COMPILER_OPTIMIZATION_FLAG}>)
 
 if(CONFIG_LTO)
   zephyr_compile_options($<TARGET_PROPERTY:compiler,optimization_lto>)

MAINTAINERS.yml

@@ -513,6 +513,8 @@ Bluetooth HCI:
     - sjanc
     - HoZHel
     - cvinayak
+    - PavelVPV
+    - HaavardRei
   files:
     - include/zephyr/drivers/bluetooth/
     - include/zephyr/drivers/bluetooth.h
@@ -537,6 +539,8 @@ Bluetooth Host:
     - sjanc
     - Thalley
     - cvinayak
+    - PavelVPV
+    - HaavardRei
   files:
     - doc/connectivity/bluetooth/
     - include/zephyr/bluetooth/
@@ -5675,8 +5679,7 @@ West:
   maintainers:
     - aescolar
   collaborators:
-    - wopu-ot
-    - thoh-ot
+    - rugeGerritsen
   files: []
   labels:
     - "area: native port"

arch/Kconfig

@@ -316,6 +316,16 @@ config USERSPACE
 	  privileged mode or handling a system call; to ensure these are always
 	  caught, enable CONFIG_HW_STACK_PROTECTION.
 
+config NOINIT_SNIPPET_FIRST
+	bool "Place the no-init linker script snippet first"
+	help
+	  By default the include/zephyr/linker/common-noinit.ld file inserts the
+	  snippets-noinit.ld file at the end of the section.  There are times when
+	  the directives in the snippets-noinit.ld file apply to the other directives
+	  in this file.  And in that case the include statement for the snippets-noinit.ld
+	  file needs to come at the start of the section.  This configuration option
+	  allows that to happen.
+
 config PRIVILEGED_STACK_SIZE
 	int "Size of privileged stack"
 	default 2048 if EMUL

arch/arm/core/cortex_m/pm_s2ram.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, Carlo Caione <[email protected]>
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,7 +15,18 @@
 /**
  * CPU context for S2RAM
  */
-__noinit _cpu_context_t _cpu_context;
+
+#if DT_NODE_EXISTS(DT_NODELABEL(pm_s2ram)) &&\
+	DT_NODE_HAS_COMPAT(DT_NODELABEL(pm_s2ram), zephyr_memory_region)
+
+/* Linker section name is given by `zephyr,memory-region` property of
+ * `zephyr,memory-region` compatible DT node with nodelabel `pm_s2ram`.
+ */
+__attribute__((section(DT_PROP(DT_NODELABEL(pm_s2ram), zephyr_memory_region))))
+#else
+__noinit
+#endif
+_cpu_context_t _cpu_context;
 
 #ifndef CONFIG_PM_S2RAM_CUSTOM_MARKING
 /**

arch/rx/core/vects.c

@@ -8,6 +8,7 @@
 #include <zephyr/irq.h>
 #include <kswap.h>
 #include <zephyr/tracing/tracing.h>
+#include <zephyr/drivers/clock_control/renesas_rx_cgc.h>
 
 typedef void (*fp)(void);
 extern void _start(void);
@@ -24,6 +25,14 @@ extern void z_rx_irq_exit(void);
 
 #define __ISR__ __attribute__((interrupt, naked))
 
+#define SET_OFS1_HOCO_BITS(reg, freq)                                                              \
+	((reg) & ~(0b11 << 12)) | ((((freq) == 24000000   ? 0b10                                   \
+				     : (freq) == 32000000 ? 0b11                                   \
+				     : (freq) == 48000000 ? 0b01                                   \
+				     : (freq) == 64000000 ? 0b00                                   \
+							  : 0b11)                                  \
+				    << 12))
+
 static ALWAYS_INLINE void REGISTER_SAVE(void)
 {
 	__asm volatile(
@@ -421,7 +430,9 @@ const void *FixedVectors[] FVECT_SECT = {
 	/* Reserved for OFSM */
 	(fp)0xFFFFFFFF,
 	(fp)0xFFFFFFFF,
-	(fp)0xFFFFFFFF,
+	(fp)(SET_OFS1_HOCO_BITS(
+		0xFFFFFFFF,
+		(RX_CGC_PROP_HAS_STATUS_OKAY_OR(DT_NODELABEL(hoco), clock_frequency, 32000000)))),
 	(fp)0xFFFFFFFF,
 	/* Reserved area */
 	(fp)0xFFFFFFFF,

boards/arduino/nano_matter/Kconfig.arduino_nano_matter

@@ -5,4 +5,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_ARDUINO_NANO_MATTER
-	select SOC_PART_NUMBER_MGM240SD22VNA
+	select SOC_MGM240SD22VNA

boards/arduino/nano_matter/arduino_nano_matter.dts

@@ -176,7 +176,6 @@
 };
 
 &gpio {
-	location-swo = <0>;
 	status = "okay";
 };
 

boards/arduino/portenta_c33/arduino_portenta_c33.dts

@@ -95,15 +95,39 @@
 	};
 };
 
-&option_setting_s {
+&option_setting_ofs0 {
 	status = "disabled";
 };
 
-&option_setting_sas {
+&option_setting_dualsel {
 	status = "disabled";
 };
 
-&option_setting_ofs {
+&option_setting_ofs1_sec {
+	status = "disabled";
+};
+
+&option_setting_banksel_sec {
+	status = "disabled";
+};
+
+&option_setting_bps_sec {
+	status = "disabled";
+};
+
+&option_setting_pbps_sec {
+	status = "disabled";
+};
+
+&option_setting_ofs1_sel {
+	status = "disabled";
+};
+
+&option_setting_banksel_sel {
+	status = "disabled";
+};
+
+&option_setting_bps_sel {
 	status = "disabled";
 };
 

boards/beagle/beagleconnect_freedom/Kconfig.sysbuild

@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Ayush Singh, BeagleBoard.org Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+if BOOTLOADER_MCUBOOT
+
+choice MCUBOOT_MODE
+	prompt "Mode of operation"
+	default MCUBOOT_MODE_SWAP_SCRATCH
+
+endchoice
+
+endif # BOOTLOADER_MCUBOOT

boards/beagle/beagleconnect_freedom/beagleconnect_freedom.dts

@@ -33,6 +33,7 @@
 		zephyr,flash = &flash0;
 		zephyr,ieee802154 = &ieee802154g;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,uart-mcumgr = &uart0;
 	};
 
 	gpio_keys {
@@ -100,17 +101,19 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		/* Allocate 128 KiB for mcuboot */
+		/* Allocate 56 KiB for mcuboot */
 		boot_partition: partition@0 {
 			label = "mcuboot";
-			reg = <0x00000000 0x00020000>;
+			reg = <0x00000000 DT_SIZE_K(56)>;
 		};
 
-		/* Allocate 568 KiB for application (avoid touching CCFG) */
-		slot0_partition: partition@20000 {
+		/* Allocate 640 KiB for application */
+		slot0_partition: partition@e000 {
 			label = "image-0";
-			reg = <0x00020000 0x0008e000>;
+			reg = <0x0000e000 DT_SIZE_K(640)>;
 		};
+
+		/* (avoid touching CCFG) */
 	};
 };
 
@@ -169,7 +172,8 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <2000000>;
-		size = <0x200000>;
+		// Size (2 MiB) is in bits
+		size = <0x1000000>;
 		//has-be32k;
 		has-dpd;
 		t-enter-dpd = <20000>;
@@ -181,22 +185,21 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			/* Allocate 568 KiB for application */
+			/* Allocate 640 KiB for application */
 			slot1_partition: partition@0 {
 				label = "image-1";
-				reg = <0x00000000 0x0008e000>;
+				reg = <0x00000000 DT_SIZE_K(640)>;
 			};
 
 			/* Allocate 128 KiB scratch for image swap */
-			scratch_partition: partition@8e000 {
+			scratch_partition: partition@A0000 {
 				label = "image-scratch";
-				reg = <0x0008e000 0x00020000>;
+				reg = <0x000a0000 DT_SIZE_K(128)>;
 			};
 
-			/* Allocate 1 MiB storage partition */
-			storage_partition: partition@ae000 {
+			storage_partition: partition@c0000 {
 				label = "storage";
-				reg = <0x000ae000 DT_SIZE_K(1024)>;
+				reg = <0x000c0000 DT_SIZE_K(1280)>;
 			};
 		};
 	};