Merge branch 'main' into bttester-pbp-support

Author: koffes

boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts

@@ -28,7 +28,6 @@
 		/delete-node/ memory@20000000;
 		/delete-node/ memory@2002f000;
 		peripheral@50000000 {
-			/delete-node/ spi@4a000;
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
@@ -84,8 +83,8 @@
 	};
 };
 
-&uart00 {
-	/delete-property/ clocks;
+&spi00 {
+	status = "disabled";
 };
 
 &uart20 {

boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi

@@ -27,6 +27,19 @@
 		};
 	};
 
+	pwmleds {
+		compatible = "pwm-leds";
+		/*
+		 * PWM signal can be exposed on GPIO pin only within same domain.
+		 * There is only one domain which contains both PWM and GPIO:
+		 * PWM20/21/22 and GPIO Port P1/P3.
+		 * Only LEDs connected to P1/P3 can work with PWM, for example LED1.
+		 */
+		pwm_led1: pwm_led_1 {
+			pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 		button0: button_0 {
@@ -56,6 +69,7 @@
 		led1 = &led1;
 		led2 = &led2;
 		led3 = &led3;
+		pwm-led0 = &pwm_led1;
 		sw0 = &button0;
 		sw1 = &button1;
 		sw2 = &button2;
@@ -70,3 +84,10 @@
 	pinctrl-1 = <&uart20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&pwm20 {
+	status = "okay";
+	pinctrl-0 = <&pwm20_default>;
+	pinctrl-1 = <&pwm20_sleep>;
+	pinctrl-names = "default", "sleep";
+};

boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi

@@ -21,4 +21,17 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ pwm20_default: pwm20_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 7)>;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 7)>;
+			low-power-enable;
+		};
+	};
 };

boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml

@@ -13,7 +13,9 @@ sysbuild: true
 ram: 512
 flash: 449
 supported:
+  - adc
   - counter
   - gpio
   - i2c
+  - pwm
   - watchdog

cmake/mcuboot.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 Nordic Semiconductor ASA
+# Copyright (c) 2020-2025 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
 # This file includes extra build system logic that is enabled when
@@ -52,23 +52,8 @@ function(zephyr_mcuboot_tasks)
     endif()
   endforeach()
 
-  # Find imgtool. Even though west is installed, imgtool might not be.
-  # The user may also have a custom manifest which doesn't include
-  # MCUboot.
-  #
-  # Therefore, go with an explicitly installed imgtool first, falling
-  # back on mcuboot/scripts/imgtool.py.
-  if(IMGTOOL)
-    set(imgtool_path "${IMGTOOL}")
-  elseif(DEFINED ZEPHYR_MCUBOOT_MODULE_DIR)
-    set(IMGTOOL_PY "${ZEPHYR_MCUBOOT_MODULE_DIR}/scripts/imgtool.py")
-    if(EXISTS "${IMGTOOL_PY}")
-      set(imgtool_path "${IMGTOOL_PY}")
-    endif()
-  endif()
-
   # No imgtool, no signed binaries.
-  if(NOT DEFINED imgtool_path)
+  if(NOT DEFINED IMGTOOL)
     message(FATAL_ERROR "Can't sign images for MCUboot: can't find imgtool. To fix, install imgtool with pip3, or add the mcuboot repository to the west manifest and ensure it has a scripts/imgtool.py file.")
     return()
   endif()
@@ -94,7 +79,7 @@ function(zephyr_mcuboot_tasks)
   endif()
 
   # Basic 'imgtool sign' command with known image information.
-  set(imgtool_sign ${PYTHON_EXECUTABLE} ${imgtool_path} sign
+  set(imgtool_sign ${PYTHON_EXECUTABLE} ${IMGTOOL} sign
       --version ${CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION} --header-size ${CONFIG_ROM_START_OFFSET}
       --slot-size ${slot_size})
 

cmake/modules/FindHostTools.cmake

@@ -61,9 +61,10 @@ find_program(OPENOCD openocd)
 # bossac is an optional dependency
 find_program(BOSSAC bossac)
 
-# imgtool is an optional dependency (the build may also fall back to scripts/imgtool.py
-# in the mcuboot repository if that's present in some cases)
-find_program(IMGTOOL imgtool)
+# imgtool is an optional dependency (prefer the version that is in the mcuboot repository, if
+# present and a user has not specified a different version)
+zephyr_get(IMGTOOL SYSBUILD LOCAL)
+find_program(IMGTOOL imgtool.py HINTS ${ZEPHYR_MCUBOOT_MODULE_DIR}/scripts/ NAMES imgtool NAMES_PER_DIR)
 
 # winpty is an optional dependency
 find_program(PTY_INTERFACE winpty)

cmake/reports/CMakeLists.txt

@@ -29,7 +29,7 @@ foreach(report ram_report rom_report footprint)
     )
 endforeach()
 
-if (CONFIG_BUILD_WITH_TFM)
+if(CONFIG_BUILD_WITH_TFM)
   foreach(report ram_report rom_report footprint)
     add_custom_target(
       tfm_${report}
@@ -40,6 +40,7 @@ if (CONFIG_BUILD_WITH_TFM)
       -o ${CMAKE_BINARY_DIR}
       ${workspace_arg}
       -d ${report_depth}
+      --json tfm_${report}.json
       ${flag_for_${report}}
       DEPENDS tfm
       USES_TERMINAL
@@ -48,22 +49,23 @@ if (CONFIG_BUILD_WITH_TFM)
   endforeach()
 endif()
 
-if (CONFIG_TFM_BL2)
+if(CONFIG_TFM_BL2)
   foreach(report ram_report rom_report footprint)
-  add_custom_target(
-    bl2_${report}
-    ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/footprint/size_report
-    -k $<TARGET_PROPERTY:tfm,BL2_ELF_FILE>
-    -z ${ZEPHYR_BASE}
-    -o ${CMAKE_BINARY_DIR}
-    ${workspace_arg}
-    -d ${report_depth}
-    ${flag_for_${report}}
-    DEPENDS tfm
-    USES_TERMINAL
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    )
+    add_custom_target(
+      bl2_${report}
+      ${PYTHON_EXECUTABLE}
+      ${ZEPHYR_BASE}/scripts/footprint/size_report
+      -k $<TARGET_PROPERTY:tfm,BL2_ELF_FILE>
+      -z ${ZEPHYR_BASE}
+      -o ${CMAKE_BINARY_DIR}
+      ${workspace_arg}
+      -d ${report_depth}
+      --json bl2_${report}.json
+      ${flag_for_${report}}
+      DEPENDS tfm
+      USES_TERMINAL
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      )
   endforeach()
 endif()
 

doc/connectivity/bluetooth/api/mesh/dfu.rst

@@ -212,9 +212,10 @@ re-provisioned. The complete list of available options is defined in :c:enum:`bt
    provisioning. In this case, the device stays provisioned and the new composition data takes place
    after re-provisioning using the Remote Provisioning models.
 :c:enumerator:`BT_MESH_DFU_EFFECT_UNPROV`
-  This effect is chosen if the composition data in the new firmware changes, the device doesn't
+  This effect is chosen if the composition data in the new firmware changes, the device does not
   support the remote provisioning, and the new composition data takes effect after applying the
-  firmware.
+  firmware. The effect can also be chosen, if it is necessary to unprovision the device for
+  application-specific reasons.
 
 When the Target node receives the Firmware Update Firmware Metadata Check message, the Firmware
 Update Server model calls the :c:member:`bt_mesh_dfu_srv_cb.check` callback, the application can

doc/releases/migration-guide-4.1.rst

@@ -305,6 +305,21 @@ Bluetooth Mesh
   set as deprecated. Default option for platforms that do not support TF-M
   is :kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA`.
 
+* Mesh key representations are not backward compatible if images are built with TinyCrypt and
+  crypto libraries based on the PSA API. Mesh no longer stores the key values for those crypto
+  libraries. The crypto library stores the keys in the internal trusted storage.
+  If a provisioned device is going to update its image that was built with
+  the :kconfig:option:`CONFIG_BT_MESH_USES_TINYCRYPT` Kconfig option set on an image
+  that was built with :kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA` or
+  :kconfig:option:`CONFIG_BT_MESH_USES_TFM_PSA` without erasing the persistent area,
+  it should be unprovisioned first and reprovisioned after update again.
+  If the image is changed over Mesh DFU, use :c:enumerator:`BT_MESH_DFU_EFFECT_UNPROV`.
+
+* Mesh explicitly depends on the Secure Storage subsystem if storing into
+  non-volatile memory (:kconfig:option:`CONFIG_BT_SETTINGS`) is enabled and
+  Mbed TLS library (:kconfig:option:`CONFIG_BT_MESH_USES_MBEDTLS_PSA`) is used.
+  Applications should be built with :kconfig:option:`CONFIG_SECURE_STORAGE` enabled.
+
 Bluetooth Audio
 ===============
 

drivers/adc/adc_common.c

@@ -17,6 +17,7 @@ int adc_gain_invert(enum adc_gain gain,
 		[ADC_GAIN_1_6] = {.mul = 6, .div = 1},
 		[ADC_GAIN_1_5] = {.mul = 5, .div = 1},
 		[ADC_GAIN_1_4] = {.mul = 4, .div = 1},
+		[ADC_GAIN_2_7] = {.mul = 7, .div = 2},
 		[ADC_GAIN_1_3] = {.mul = 3, .div = 1},
 		[ADC_GAIN_2_5] = {.mul = 5, .div = 2},
 		[ADC_GAIN_1_2] = {.mul = 2, .div = 1},