Move to zephyr v4.1

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/zmkfirmware/zmk-dev-arm:3.5
+FROM docker.io/zmkfirmware/zmk-dev-arm:4.1-branch
 
 COPY .bashrc tmp
 RUN mv /tmp/.bashrc ~/.bashrc

.github/workflows/ble-test.yml

@@ -35,7 +35,7 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:4.1
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/build-user-config.yml

@@ -57,7 +57,7 @@ jobs:
           echo "build_dir=$(mktemp -d)" >> $GITHUB_ENV
 
       - name: Prepare variables
-        shell: sh -x {0}
+        shell: bash -x {0}
         env:
           board: ${{ matrix.board }}
           shield: ${{ matrix.shield }}
@@ -81,7 +81,7 @@ jobs:
           echo "extra_west_args=${extra_west_args}" >> $GITHUB_ENV
           echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV
           echo "display_name=${shield:+$shield - }${board}" >> $GITHUB_ENV
-          echo "artifact_name=${artifact_name:-${shield:+$shield-}${board}-zmk}" >> $GITHUB_ENV
+          echo "artifact_name=${artifact_name:-${shield:+$shield-}${board//\//_}-zmk}" >> $GITHUB_ENV
 
       - name: Copy config files to isolated temporary directory
         run: |

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:4.1
     needs: compile-matrix
     strategy:
       matrix:
@@ -123,7 +123,7 @@ jobs:
                 }
 
                 const cmakeName = shieldArgs['cmake-args'] ? '-' + (shieldArgs.nickname || shieldArgs['cmake-args'].split(' ').join('')) : '';
-                const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`;
+                const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`.replaceAll('/', '_');
 
                 await artifact.uploadArtifact(artifactName, files, rootDirectory, options);
               } catch (e) {

.github/workflows/hardware-metadata-validation.yml

@@ -18,7 +18,7 @@ jobs:
   validate-metadata:
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-dev-arm:3.5
+      image: docker.io/zmkfirmware/zmk-dev-arm:4.1
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:4.1
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -66,7 +66,7 @@ jobs:
         run: west zephyr-export
       - name: Test ${{ matrix.test }}
         working-directory: app
-        run: west test tests/${{ matrix.test }}
+        run: ZMK_TESTS_VERBOSE=1 west test tests/${{ matrix.test }}
       - name: Archive artifacts
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

app/CMakeLists.txt

@@ -23,6 +23,7 @@ zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/ext_power.h)
 # Add your source file to the "app" target. This must come after
 # find_package(Zephyr) which defines the target.
 target_include_directories(app PRIVATE include)
+add_subdirectory(src/boot)
 target_sources(app PRIVATE src/stdlib.c)
 target_sources(app PRIVATE src/activity.c)
 target_sources(app PRIVATE src/behavior.c)

app/Kconfig

@@ -131,6 +131,9 @@ config ZMK_USB_BOOT
     select USB_HID_BOOT_PROTOCOL
     select USB_DEVICE_SOF
 
+config USB_DEVICE_INITIALIZE_AT_BOOT
+    default n
+
 if ZMK_USB
 
 config USB_NUMOF_EP_WRITE_RETRIES
@@ -186,8 +189,8 @@ config BT_CTLR_PHY_2M
     default n if ZMK_BLE_EXPERIMENTAL_CONN
 
 # BT_TINYCRYPT_ECC is required for BT_SMP_SC_PAIR_ONLY when using HCI
-config BT_TINYCRYPT_ECC
-    default y if BT_HCI && !BT_CTLR
+# config BT_TINYCRYPT_ECC
+    # default y if BT_HCI && !BT_CTLR
 
 config ZMK_BLE_THREAD_STACK_SIZE
     int "BLE notify thread stack size"
@@ -478,13 +481,15 @@ endmenu
 
 menu "Advanced"
 
+rsource "src/boot/Kconfig"
+
 menu "Initialization Priorities"
 
 if USB_DEVICE_STACK
 
 config ZMK_USB_INIT_PRIORITY
     int "USB Init Priority"
-    default 94
+    default 96
 
 config ZMK_USB_HID_INIT_PRIORITY
     int "USB HID Init Priority"
@@ -653,6 +658,13 @@ endmenu # Advanced
 
 endmenu # ZMK
 
+if SOC_FAMILY_NORDIC_NRF
+
+config NRF_SOC_VALIDATE_HEADERS_DISABLED
+    default y
+
+endif
+
 config KERNEL_BIN_NAME
     default "zmk"
 
@@ -705,7 +717,7 @@ rsource "boards/shields/*/Kconfig.shield"
 # Duplicated from Kconfig.zephyr
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 
-source "$(BOARD_DIR)/Kconfig.defconfig"
+# source "$(BOARD_DIR)/Kconfig.defconfig"
 
 # This loads board and shield Kconfigs found under zmk-config/config/
 osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig"

app/Kconfig.defaults

@@ -3,6 +3,7 @@
 
 config SYSTEM_WORKQUEUE_STACK_SIZE
     default 2048 if SOC_RP2040
+    default 3072 if ZMK_DISPLAY
     default 2048 if ZMK_BLE
 
 # HID
@@ -110,4 +111,5 @@ config ZMK_BATTERY_REPORT_INTERVAL
     default 60
 
 # Imports
+rsource "src/boot/Kconfig.defaults"
 rsource "src/split/Kconfig.defaults"

app/boards/adafruit_kb2040.conf

@@ -2,3 +2,7 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_ZMK_USB=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/adafruit_kb2040.overlay

@@ -4,4 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &pro_micro_serial { status = "disabled"; };

app/boards/adafruit_qt_py_rp2040.conf

@@ -2,3 +2,7 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_ZMK_USB=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/adafruit_qt_py_rp2040.overlay

@@ -4,4 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &xiao_serial { status = "disabled"; };