zephyrproject-rtos · carlescufi · Oct 25, 2024 · Oct 24, 2024 · Oct 24, 2024 · Aug 1, 2024
diff --git a/.github/workflows/bsim-tests.yaml b/.github/workflows/bsim-tests.yaml
@@ -37,7 +37,7 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.3.20241022
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr

diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.3.20241022
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false

diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.3.20241022
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false

diff --git a/.github/workflows/errno.yml b/.github/workflows/errno.yml
@@ -10,7 +10,7 @@ jobs:
   check-errno:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.27.3
+      image: ghcr.io/zephyrproject-rtos/ci:v0.27.4
 
     steps:
       - name: Apply container owner mismatch workaround

diff --git a/.github/workflows/footprint-tracking.yml b/.github/workflows/footprint-tracking.yml
@@ -26,7 +26,7 @@ jobs:
       group: zephyr-runner-v2-linux-x64-4xlarge
     if: github.repository_owner == 'zephyrproject-rtos'
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.3.20241022
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     defaults:
       run:

diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
@@ -26,7 +26,7 @@ jobs:
           west init -l . || true
 
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.3.1
+        uses: zephyrproject-rtos/action-manifest@pull/14/head
         with:
           github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
           manifest-path: 'west.yml'

diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml
@@ -25,7 +25,7 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.3.20241022
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     outputs:
       subset: ${{ steps.output-services.outputs.subset }}
@@ -130,7 +130,7 @@ jobs:
     needs: twister-build-prep
     if: needs.twister-build-prep.outputs.size != 0
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.3.20241022
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false

diff --git a/.github/workflows/twister_tests_blackbox.yml b/.github/workflows/twister_tests_blackbox.yml
@@ -24,7 +24,7 @@ jobs:
         python-version: ['3.10', '3.11', '3.12', '3.13']
         os: [ubuntu-22.04]
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.27.3
+      image: ghcr.io/zephyrproject-rtos/ci:v0.27.4
 
     steps:
     - name: Apply Container Owner Mismatch Workaround

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
@@ -17,13 +17,13 @@ osource "${APPLICATION_SOURCE_DIR}/VERSION"
 # Shield defaults should have precedence over board defaults, which should have
 # precedence over SoC defaults, so include them in that order.
 #
-# $ARCH and $BOARD_DIR will be glob patterns when building documentation.
+# $ARCH and $KCONFIG_BOARD_DIR will be glob patterns when building documentation.
 # This loads custom shields defconfigs (from BOARD_ROOT)
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 # This loads Zephyr base shield defconfigs
 source "boards/shields/*/Kconfig.defconfig"
 
-osource "$(BOARD_DIR)/Kconfig.defconfig"
+osource "$(KCONFIG_BOARD_DIR)/Kconfig.defconfig"
 
 # This loads Zephyr specific SoC root defconfigs
 source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
-VERSION_MAJOR = 3
-VERSION_MINOR = 7
-PATCHLEVEL = 99
+VERSION_MAJOR = 4
+VERSION_MINOR = 0
+PATCHLEVEL = 0
 VERSION_TWEAK = 0
-EXTRAVERSION =
+EXTRAVERSION = rc1
diff --git a/boards/Kconfig b/boards/Kconfig
@@ -129,7 +129,7 @@ config QEMU_EXTRA_FLAGS
 	  GDBstub over serial with `-serial tcp:127.0.0.1:5678,server`
 
 # There might not be any board options, hence the optional source
-osource "$(BOARD_DIR)/Kconfig"
+osource "$(KCONFIG_BOARD_DIR)/Kconfig"
 endmenu
 
 config BOARD_HAS_TIMING_FUNCTIONS

diff --git a/boards/Kconfig.v1 b/boards/Kconfig.v1
@@ -2,9 +2,13 @@
 
 # SPDX-License-Identifier: Apache-2.0
 
+# In HWMv1 the KCONFIG_BOARD_DIR points directly to the BOARD_DIR.
+# Set the BOARD_DIR variable for backwards compatibility to legacy hardware model.
+BOARD_DIR := $(KCONFIG_BOARD_DIR)
+
 choice
 	prompt "Board Selection"
 
-source "$(BOARD_DIR)/Kconfig.board"
+source "$(KCONFIG_BOARD_DIR)/Kconfig.board"
 
 endchoice
diff --git a/boards/Kconfig.v2 b/boards/Kconfig.v2
@@ -25,4 +25,4 @@ config BOARD_QUALIFIERS
 	  For example, if building for ``nrf5340dk/nrf5340/cpuapp`` then this will contain the
 	  value ``nrf5340/cpuapp``.
 
-osource "$(BOARD_DIR)/Kconfig.$(BOARD)"
+osource "$(KCONFIG_BOARD_DIR)/Kconfig.$(BOARD)"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_0_8_0.dtsi
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &suit_storage_partition;
+
+/ {
+	reserved-memory {
+		suit_storage_partition: memory@e1eb000 {
+			reg = <0xe1eb000 DT_SIZE_K(24)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_0_8_0.dtsi"
diff --git a/boards/seeed/xiao_esp32s3/Kconfig b/boards/seeed/xiao_esp32s3/Kconfig
@@ -3,5 +3,5 @@
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
-	default 4096 if BOARD_XIAO_ESP32S3_ESP32S3_PROCPU
+	default 4096 if BOARD_XIAO_ESP32S3_ESP32S3_PROCPU || BOARD_XIAO_ESP32S3_ESP32S3_PROCPU_SENSE
 	default 256 if BOARD_XIAO_ESP32S3_ESP32S3_APPCPU
diff --git a/boards/seeed/xiao_esp32s3/Kconfig.xiao_esp32s3 b/boards/seeed/xiao_esp32s3/Kconfig.xiao_esp32s3
@@ -5,5 +5,5 @@
 
 config BOARD_XIAO_ESP32S3
 	select SOC_ESP32S3_WROOM_N8R8
-	select SOC_ESP32S3_PROCPU if BOARD_XIAO_ESP32S3_ESP32S3_PROCPU
+	select SOC_ESP32S3_PROCPU if BOARD_XIAO_ESP32S3_ESP32S3_PROCPU || BOARD_XIAO_ESP32S3_ESP32S3_PROCPU_SENSE
 	select SOC_ESP32S3_APPCPU if BOARD_XIAO_ESP32S3_ESP32S3_APPCPU
diff --git a/boards/seeed/xiao_esp32s3/board.yml b/boards/seeed/xiao_esp32s3/board.yml
@@ -4,3 +4,6 @@ board:
   vendor: seeed
   socs:
   - name: esp32s3
+    variants:
+    - name: 'sense'
+      cpucluster: 'procpu'
diff --git a/boards/seeed/xiao_esp32s3/doc/img/xiao-esp32s3-sense.png b/boards/seeed/xiao_esp32s3/doc/img/xiao-esp32s3-sense.png
diff --git a/boards/seeed/xiao_esp32s3/doc/index.rst b/boards/seeed/xiao_esp32s3/doc/index.rst
@@ -1,13 +1,28 @@
-.. zephyr:board:: xiao_esp32s3
+.. _xiao_esp32s3:
+
+XIAO ESP32S3/XIAO ESP32S3 Sense
+###############################
 
 Overview
 ********
 
-Seeed Studio XIAO ESP32S3 is an IoT mini development board based on the
+Seeed Studio XIAO ESP32S3 and XIAO ESP32S3 Sense are IoT mini development boards based on the
 Espressif ESP32-S3 WiFi/Bluetooth dual-mode chip.
 
 For more details see the `Seeed Studio XIAO ESP32S3`_ wiki page.
 
+.. figure:: img/xiao_esp32s3.jpg
+   :align: center
+   :alt: XIAO ESP32S3
+
+   XIAO ESP32S3
+
+.. figure:: img/xiao-esp32s3-sense.png
+   :align: center
+   :alt: XIAO ESP32S3 Sense
+
+   XIAO ESP32S3 Sense
+
 Hardware
 ********
 
@@ -21,6 +36,8 @@ and Bluetooth® Low Energy (Bluetooth LE). It consists of high-performance dual-
 (Xtensa® 32-bit LX7), a low power coprocessor, a Wi-Fi baseband, a Bluetooth LE baseband,
 RF module, and numerous peripherals.
 
+Additionally, Sense variant integrates a OV2640 camera sensor, microphone and sdcard slot.
+
 Supported Features
 ==================
 
@@ -57,6 +74,8 @@ Current Zephyr's XIAO ESP32S3 board supports the following features:
 +------------+------------+-------------------------------------+
 | GDMA       | on-chip    | dma                                 |
 +------------+------------+-------------------------------------+
+| LCD_CAM    | on-chip    | lcd_cam                             |
++------------+------------+-------------------------------------+
 
 Connections and IOs
 ===================
@@ -67,7 +86,7 @@ The board uses a standard XIAO pinout, the default pin mapping is the following:
    :align: center
    :alt: XIAO ESP32S3 Pinout
 
-   XIAO ESP32S3 Pinout
+   XIAO ESP32S3 and XIAO ESP32S3 Sense Pinout
 
 Prerequisites
 -------------
@@ -174,19 +193,41 @@ The only difference is the structure of the build directory.
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: xiao_esp32s3/esp32s3/procpu
-   :goals: build
+.. tabs::
+
+   .. group-tab:: XIAO ESP32S3
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu
+         :goals: build
+
+   .. group-tab:: XIAO ESP32S3 Sense
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu/sense
+         :goals: build
 
 The usual ``flash`` target will work with the ``xiao_esp32s3`` board
 configuration. Here is an example for the :zephyr:code-sample:`hello_world`
 application.
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: xiao_esp32s3/esp32s3/procpu
-   :goals: flash
+.. tabs::
+
+   .. group-tab:: XIAO ESP32S3
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu
+         :goals: flash
+
+   .. group-tab:: XIAO ESP32S3 Sense
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu/sense
+         :goals: flash
 
 Open the serial monitor using the following command:
 
@@ -213,17 +254,39 @@ Further documentation can be obtained from the SoC vendor in `JTAG debugging for
 
 Here is an example for building the :zephyr:code-sample:`hello_world` application.
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: xiao_esp32s3/esp32/procpu
-   :goals: build flash
+.. tabs::
+
+   .. group-tab:: XIAO ESP32S3
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu
+         :goals: debug
+
+   .. group-tab:: XIAO ESP32S3 Sense
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu/sense
+         :goals: debug
 
 You can debug an application in the usual way. Here is an example for the :zephyr:code-sample:`hello_world` application.
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: xiao_esp32s3/esp32/procpu
-   :goals: debug
+.. tabs::
+
+   .. group-tab:: XIAO ESP32S3
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu
+         :goals: debug
+
+   .. group-tab:: XIAO ESP32S3 Sense
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/hello_world
+         :board: xiao_esp32s3/esp32/procpu/sense
+         :goals: debug
 
 References
 **********