Merge branch 'main' into auto-manifest-sdk-zephyr-1972

.checkpatch.conf

@@ -49,4 +49,5 @@
 --exclude doc/nrf/.*/.*/.*/images
 --exclude doc/nrf/.*/.*/.*/.*/images
 --exclude applications/nrf5340_audio/src/utils/macros
+--exclude lib/at_parser/generated
 --exclude lib/bin/lwm2m_carrier/include

.github/test-spec.yml

@@ -558,6 +558,7 @@
   - "tests/subsys/event_manager_proxy/**/*"
   - "tests/benchmarks/multicore/**/*"
   - "tests/drivers/pwm/**/*"
+  - "tests/drivers/sensor/**/*"
 
 "CI-ps-test":
   - "samples/nrf_rpc/protocols_serialization/**/*"

.github/workflows/west-commands.yml

@@ -14,27 +14,27 @@ jobs:
     runs-on: ubuntu-latest
     name: Run Python checks for west commands on patch series (PR)
     steps:
-    - name: Checkout the code
-      uses: actions/checkout@v3
-      with:
-        path: ncs/nrf
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-    - name: cache-pip
-      uses: actions/cache@v3
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-doc-pip
-    - name: Install python dependencies
-      working-directory: ncs/nrf
-      run: |
-        pip3 install -U pip
-        pip3 install -U setuptools
-        pip3 install -U wheel
-        pip3 install -U mypy types-colorama types-editdistance types-PyYAML
-        grep -E "west" scripts/requirements-fixed.txt | xargs pip3 install -U
-        pip3 show -f west
-    - name: Run mypy
-      working-directory: ncs/nrf/scripts/west_commands
-      run: |
-        python3 -m mypy --config-file mypy.ini ncs_west_helpers.py pygit2_helpers.py ncs_commands.py
+      - name: Checkout the code
+        uses: actions/checkout@v3
+        with:
+          path: ncs/nrf
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - name: cache-pip
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-doc-pip
+      - name: Install python dependencies
+        working-directory: ncs/nrf
+        run: |
+          pip3 install -U pip
+          pip3 install -U setuptools
+          pip3 install -U wheel
+          pip3 install -U mypy types-colorama types-editdistance types-PyYAML
+          grep -E "west==" scripts/requirements-fixed.txt | cut -f1 -d"#" | xargs pip3 install -U
+          pip3 show -f west
+      - name: Run mypy
+        working-directory: ncs/nrf/scripts/west_commands
+        run: |
+          python3 -m mypy --config-file mypy.ini ncs_west_helpers.py pygit2_helpers.py ncs_commands.py

CODEOWNERS

@@ -109,6 +109,7 @@ Kconfig*                                  @tejlmand
 /include/mpsl/                            @nrfconnect/ncs-dragoon
 /include/net/                             @rlubos
 /include/nfc/                             @anangl @grochu
+/include/nrf_compress/                    @nordicjm
 /include/sdfw/                            @anhmolt @hakonfam @jonathannilsen
 /include/shell/                           @nordic-krch
 /lib/bin/                                 @rlubos @lemrey
@@ -263,6 +264,7 @@ Kconfig*                                  @tejlmand
 /subsys/bluetooth/services/wifi_prov/     @wentong-li @bama-nordic
 /subsys/bootloader/                       @hakonfam @sigvartmh
 /subsys/caf/                              @pdunaj
+/subsys/nrf_compress/                     @nordicjm
 /subsys/debug/                            @nordic-krch @anangl
 /subsys/dfu/                              @hakonfam @sigvartmh
 /subsys/dfu/dfu_multi_image/              @Damian-Nordic
@@ -312,15 +314,18 @@ Kconfig*                                  @tejlmand
 /subsys/zigbee/                           @milewr
 /tests/                                   @PerMac @katgiadla
 /tests/benchmarks/multicore/              @carlescufi
+/tests/benchmarks/multicore/idle/         @adamkondraciuk @nrfconnect/ncs-low-level-test
 /tests/bluetooth/tester/                  @carlescufi @nrfconnect/ncs-paladin
 /tests/bluetooth/iso/                     @nrfconnect/ncs-audio @Frodevan
+/tests/subsys/nrf_compress/               @nordicjm
 /tests/crypto/                            @stephen-nordic @magnev
 /tests/drivers/flash_patch/               @oyvindronningstad
 /tests/drivers/flash/flash_rpc/           @sigvartmh
 /tests/drivers/fprotect/                  @oyvindronningstad
 /tests/drivers/lpuart/                    @nordic-krch
 /tests/drivers/nrfx_integration_test/     @anangl
 /tests/drivers/pwm/gpio_loopback/         @nrfconnect/ncs-low-level-test
+/tests/drivers/sensor/multicore_temp/     @nrfconnect/ncs-low-level-test
 /tests/lib/at_cmd_parser/                 @rlubos
 /tests/lib/at_parser/                     @MirkoCovizzi
 /tests/lib/at_cmd_custom/                 @eivindj-nordic

VERSION

@@ -1 +1 @@
-2.7.99
+2.7.99-cs1

applications/nrf_desktop/bootloader_dfu.rst

@@ -216,11 +216,15 @@ SUIT also has the following options in the sysbuild configuration:
    * ``SB_CONFIG_SUIT_ENVELOPE`` - Required to create the SUIT envelope.
      Turned on by default on the ``nrf54h20dk`` board.
      The envelope is used directly as a DFU update file by the DFU tools.
-   * ``SB_CONFIG_SUIT_ENVELOPE_SEQUENCE_NUM`` - The nRF Desktop application uses the sequence number to define an application version.
 
 .. note::
    The ``SB_CONFIG_SUIT_ENVELOPE_SIGN`` is disabled, so the generated SUIT envelope is not signed.
 
+By default, the SUIT generator sets the values inside the manifest based on the content of the :file:`VERSION` file, used for :ref:`zephyr:app-version-details` in Zephyr and the |NCS|.:
+
+   * The manifest sequence number is set in the same manner as the ``APPVERSION`` CMake variable.
+   * The manifest current (semantic) version is set in the same manner as the ``APP_VERSION_EXTENDED_STRING`` CMake variable.
+
 On the ``nrf54h20dk`` board, the dedicated DFU partition called ``dfu_partition`` is defined by default in the DTS.
 The partition is used to store the incoming SUIT envelope with an update candidate.
 The application relies on the default memory layout defined by the board.

applications/nrf_desktop/src/modules/Kconfig.usb_state

@@ -16,10 +16,15 @@ config DESKTOP_USB_REMOTE_WAKEUP
 	bool "Enable USB remote wakeup"
 	default y
 	depends on DESKTOP_USB_PM_ENABLE
+	depends on !UDC_DWC2
 	help
 	  Enable USB remote wakeup functionality. The USB wakeup request is
 	  triggered on wake_up_event.
 
+	  The DWC2 USB device controller driver used by the nRF54H20 SoC does
+	  not support the remote wakeup capability. Because of that, the feature
+	  is disabled in the configuration.
+
 config DESKTOP_USB_SUBSCRIBER_REPORT_PRIORITY
 	int "USB HID reports subscriber priority"
 	default 255

boards/nordic/thingy91x/CMakeLists.txt

@@ -17,6 +17,13 @@ if(CONFIG_BOARD_THINGY91X_NRF9151_NS)
   set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91x_nrf9151_pm_static.yml CACHE INTERNAL "")
 endif()
 
+# If the BMM350 driver is not used, use a minimal initialization instead to save power.
+# Once a driver is available in the Zephyr tree, this can be removed.
+if (CONFIG_REGULATOR AND CONFIG_I2C AND NOT CONFIG_BMM350)
+  zephyr_library_named(bmm350_init_minimal)
+  zephyr_library_sources(bmm350_init_minimal.c)
+endif()
+
 if(CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY91X_NRF5340_CPUAPP_NS)
   if(CONFIG_BOARD_ENABLE_CPUNET)
     zephyr_library()

boards/nordic/thingy91x/bmm350_init_minimal.c

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA.
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/regulator.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(bmm350_init_minimal, CONFIG_BOARD_LOG_LEVEL);
+
+#if	DT_NODE_HAS_STATUS(DT_NODELABEL(ldsw_sensors), okay) && \
+	DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
+
+#define LDSW_SENSORS DEVICE_DT_GET(DT_NODELABEL(ldsw_sensors))
+#define BMM350_I2C_DEVICE DEVICE_DT_GET(DT_NODELABEL(i2c2))
+#define BMM350_I2C_ADDRESS 0x14
+
+#define BMM350_REG_OTP_CMD_REG 0x50
+#define BMM350_OTP_CMD_PWR_OFF_OTP 0x80
+#define BMM350_START_UP_TIME_FROM_POR 3000
+
+static int bmm350_init_minimal(void)
+{
+	if (regulator_is_enabled(LDSW_SENSORS)) {
+		k_sleep(K_USEC(BMM350_START_UP_TIME_FROM_POR));
+
+		/* Turn off the OTP memory on BMM350 to save power */
+		return i2c_reg_write_byte(BMM350_I2C_DEVICE, BMM350_I2C_ADDRESS,
+					  BMM350_REG_OTP_CMD_REG, BMM350_OTP_CMD_PWR_OFF_OTP);
+	}
+	return 0;
+}
+
+SYS_INIT(bmm350_init_minimal, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY);
+
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(ldsw_sensors), okay) && \
+	* DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay)
+	*/

cmake/multi_image.cmake

@@ -392,6 +392,7 @@ function(add_child_image_from_source)
       ZEPHYR_MODULES
       ZEPHYR_EXTRA_MODULES
       ZEPHYR_TOOLCHAIN_VARIANT
+      CROSS_COMPILE
       GNUARMEMB_TOOLCHAIN_PATH
       EXTRA_KCONFIG_TARGETS
       NCS_TOOLCHAIN_VERSION