fix(studio): Allow setting UART RPC thread priority (#3290)

To ensure we can tune things when other threads may have priority,
preventing UART processing in time for the studio UI requirements,
adjust our default UART thread priority, and allow overriding as needed.

.github/workflows/ble-test.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Find test directories
         id: test-dirs
         run: |
@@ -38,7 +38,7 @@ jobs:
       image: docker.io/zmkfirmware/zmk-build-arm:4.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Cache west modules
         uses: actions/cache@v4
         env:

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

@@ -30,17 +30,28 @@ jobs:
     name: Fetch Build Keyboards
     outputs:
       build_matrix: ${{ env.build_matrix }}
+      has_valid_build_matrix: ${{ steps.fetch.outputs.has_valid_build_matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Fetch Build Matrix
+        id: fetch
         run: |
-          echo "build_matrix=$(yq -oj -I0 '${{ inputs.build_matrix_path }}')" >> $GITHUB_ENV
-          yq -oj "${{ inputs.build_matrix_path }}"
+          matrix_content=$(yq -oj -I0 '${{ inputs.build_matrix_path }}')
+
+          if [ -z "$matrix_content" ] || [ "$matrix_content" = "null" ]; then
+            echo "::notice file=${{inputs.build_matrix_path}},title=Empty build matrix file::To add a keyboard to the build, see https://zmk.dev/docs/user-setup#add-a-keyboard."
+            echo "has_valid_build_matrix=false" >> $GITHUB_OUTPUT
+          else
+            echo "build_matrix=$matrix_content" >> $GITHUB_ENV
+            echo "has_valid_build_matrix=true" >> $GITHUB_OUTPUT
+            echo "$matrix_content"
+          fi
 
   build:
     runs-on: ubuntu-latest
+    if: needs.matrix.outputs.has_valid_build_matrix == 'true'
     container:
       image: zmkfirmware/zmk-build-arm:stable
     needs: matrix
@@ -56,7 +67,7 @@ jobs:
           curl -fsSL https://deb.nodesource.com/setup_22.x | bash && apt install -y nodejs
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Create build directory
         run: |
@@ -147,6 +158,29 @@ jobs:
           echo "See also the [list of released versions](https://github.com/zmkfirmware/zmk/releases)." >> $GITHUB_STEP_SUMMARY
           echo "If you wish to stay on main, check the most recent pending release PR for breaking changes. [Our blog](https://zmk.dev/blog) may have upgrade information if breaking changes are significant." >> $GITHUB_STEP_SUMMARY
 
+      - name: Check if building a board without explicit ZMK compat
+        if: always()
+        working-directory: "${{ env.base_dir }}/${{ inputs.config_path }}"
+        run: |
+          if ! (grep "CONFIG_ZMK_BOARD_COMPAT=y" "${{ env.build_dir }}/zephyr/.config" > /dev/null)
+          then
+            original_board=$(echo "${{ matrix.board }}" | sed -e 's$/.*$$')
+            west_board=$(west boards --board-root ${{ env.base_dir }}/zmk/app/module --board-root ${{ env.base_dir }}/zmk/app --board "${original_board}")
+            if [ -z "$west_board" ]; then
+              echo "Not found the board listed with west boards. Skipping further checking."
+              exit 0
+            fi
+
+            west boards --board-root ${{ env.base_dir }}/zmk/app/module --board-root ${{ env.base_dir }}/zmk/app --board "${original_board}" --format "{qualifiers}" | grep "zmk" > /dev/null
+            if [ $? -ne 0 ]
+            then
+              echo "::warning file=build/zephyr/.config,title=Missing ZMK Compat::The selected board does not report explicit ZMK compat. Please verify you've selected the correct board and ZMK variant if one exists"
+            else
+              echo "::error file=build/zephyr/.config,title=Missing ZMK Compat::The selected board is not set up for ZMK and there is a ZMK variant available. See https://zmk.dev/blog/2025/12/09/zephyr-4-1#zmk-board-variant."
+              exit 1
+            fi
+          fi
+
       - name: ${{ env.display_name }} Kconfig file
         run: |
           if [ -f "${{ env.build_dir }}/zephyr/.config" ]
@@ -190,6 +224,7 @@ jobs:
 
   merge:
     runs-on: ubuntu-latest
+    if: needs.matrix.outputs.has_valid_build_matrix == 'true'
     needs: build
     name: Merge Output Artifacts
     steps:

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
         include: ${{ fromJSON(needs.compile-matrix.outputs.include-list) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Cache west modules
@@ -61,7 +61,7 @@ jobs:
         with:
           node-version: "14.x"
       - name: Install @actions/artifact
-        run: npm install @actions/artifact
+        run: npm install @actions/artifact@5.0.3
       - name: Build
         uses: actions/github-script@v7
         id: boards-list
@@ -187,7 +187,7 @@ jobs:
       core-include: ${{ steps.core-list.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Use Node.js
@@ -218,7 +218,7 @@ jobs:
       boards-include: ${{ steps.boards-list.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -277,6 +277,7 @@ jobs:
                       );
                     } else {
                       console.error("Board without keys or interconnect");
+                      return [];
                     }
                     break;
                   case "shield":
@@ -345,7 +346,7 @@ jobs:
       organized-metadata: ${{ steps.organize-metadata.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Use Node.js
@@ -427,7 +428,7 @@ jobs:
       core-changes: ${{ steps.core-changes.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - uses: tj-actions/changed-files@9200e69727eb73eb060652b19946b8a2fdfb654b # pin to v45.0.8 due to https://github.com/tj-actions/changed-files/issues/2463 https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised

.github/workflows/doc-checks.yml

@@ -14,7 +14,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: bahmutov/npm-install@v1
         with:
           working-directory: docs
@@ -24,7 +24,7 @@ jobs:
   typecheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: bahmutov/npm-install@v1
         with:
           working-directory: docs

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

@@ -20,7 +20,7 @@ jobs:
     container:
       image: docker.io/zmkfirmware/zmk-dev-arm:4.1
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: pip install --break-system-packages -r app/scripts/requirements.txt
       - name: West init

.github/workflows/pre-commit.yml

@@ -8,7 +8,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x

.github/workflows/release-please.yml

@@ -35,7 +35,7 @@ jobs:
       ZMK_RELEASE_PLEASE_TOKEN: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
       VERSION: v${{ needs.handle-commit.outputs.major }}.${{ needs.handle-commit.outputs.minor }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Create major.minor branch
         if: ${{ needs.handle-commit.outputs.patch == '0' }}

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Find test directories
         id: test-dirs
         run: |
@@ -40,7 +40,7 @@ jobs:
       image: docker.io/zmkfirmware/zmk-build-arm:4.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Cache west modules
         uses: actions/cache@v4
         env:

app/Kconfig

@@ -5,6 +5,17 @@ mainmenu "ZMK Firmware"
 
 menu "ZMK"
 
+config ZMK_BOARD_COMPAT
+    bool
+    help
+      Hidden symbol used to hint that a board has been specifically
+      set up with various ZMK requirements in mind, e.g. settings
+      storage, bootloader integration, etc.
+
+      Failure to set this will warn users they may want to verify they
+      used a ZMK variant of an upstream board, or are using a board
+      properly migrated to a newer ZMK version.
+
 menu "Basic Keyboard Setup"
 
 config ZMK_KEYBOARD_NAME

app/boards/adafruit/kb2040/Kconfig.adafruit_kb2040

@@ -0,0 +1,9 @@
+# Copyright (c) 2026 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_ADAFRUIT_KB2040
+    select ZMK_BOARD_COMPAT if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+    imply RETAINED_MEM if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+    imply RETENTION if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+

app/boards/adafruit/kb2040/adafruit_kb2040.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: adafruit_kb2040
+id: adafruit_kb2040//zmk
 name: Adafruit KB2040
 type: board
 arch: arm

app/boards/adafruit/kb2040/adafruit_kb2040_zmk.dts

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

app/boards/adafruit/kb2040/adafruit_kb2040_zmk_defconfig

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
+
+# Enable reset by default
+CONFIG_RESET=y
+
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
+# Code partition needed to target the correct flash range
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Output UF2 by default, native bootloader supports it.
+CONFIG_BUILD_OUTPUT_UF2=y
+
+# USB HID
+CONFIG_ZMK_USB=y
+
+# Bootloader Support
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/adafruit/kb2040/board.yml

@@ -0,0 +1,5 @@
+board:
+  extend: adafruit_kb2040
+  variants:
+    - name: zmk
+      qualifier: rp2040

app/boards/adafruit/qt_py_rp2040/Kconfig.adafruit_qt_py_rp2040

@@ -0,0 +1,9 @@
+# Copyright (c) 2026 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_ADAFRUIT_QT_PY_RP2040
+    select ZMK_BOARD_COMPAT if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+    imply RETAINED_MEM if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+    imply RETENTION if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+

app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: adafruit_qt_py_rp2040
+id: adafruit_qt_py_rp2040//zmk
 name: Adafruit QT Py RP2040
 type: board
 arch: arm

app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk.dts

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

app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk_defconfig

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
+
+# Enable reset by default
+CONFIG_RESET=y
+
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
+# Code partition needed to target the correct flash range
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Output UF2 by default, native bootloader supports it.
+CONFIG_BUILD_OUTPUT_UF2=y
+
+# USB HID
+CONFIG_ZMK_USB=y
+
+# Bootloader Support
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/adafruit/qt_py_rp2040/board.yml

@@ -0,0 +1,5 @@
+board:
+  extend: adafruit_qt_py_rp2040
+  variants:
+    - name: zmk
+      qualifier: rp2040

app/boards/arm/boardsource_blok/boardsource_blok.zmk.yml

@@ -1,9 +0,0 @@
-file_format: "1"
-id: boardsource_blok
-name: BoardSource blok
-type: board
-arch: arm
-outputs:
-  - usb
-url: https://peg.software/docs/blok
-exposes: [pro_micro]

app/boards/boardsource/blok/Kconfig.boardsource_blok

@@ -0,0 +1,9 @@
+# Copyright (c) 2026 Pete Johanson
+# SPDX-License-Identifier: MIT
+
+config BOARD_BOARDSOURCE_BLOK
+    select ZMK_BOARD_COMPAT if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+    imply RETAINED_MEM if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+    imply RETENTION if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+

app/boards/boardsource/blok/board.yml

@@ -0,0 +1,5 @@
+board:
+  extend: boardsource_blok
+  variants:
+    - name: zmk
+      qualifier: rp2040

app/boards/boardsource/blok/boardsource_blok.zmk.yml

@@ -0,0 +1,9 @@
+file_format: "1"
+id: boardsource_blok//zmk
+name: Boardsource Blok
+type: board
+arch: arm
+outputs:
+  - usb
+url: https://boardsource.xyz/products/blok-rp2040-keyboard-controller
+exposes: [pro_micro]

app/boards/boardsource/blok/boardsource_blok_zmk.dts

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/boardsource/blok/boardsource_blok.dts>
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
+&pro_micro_serial { status = "disabled"; };
+
+&code_partition {
+    reg = <0x100 (DT_SIZE_M(16) - 0x100 - DT_SIZE_K(512))>;
+};
+
+&flash0 {
+    partitions {
+        storage_partition: partition@f80000 {
+            reg = <0xf80000 DT_SIZE_K(512)>;
+            read-only;
+        };
+    };
+};

app/boards/boardsource/blok/boardsource_blok_zmk_defconfig

@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
+
+CONFIG_RESET=y
+
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
+# Code partition needed to target the correct flash range
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Output UF2 by default, native bootloader supports it.
+CONFIG_BUILD_OUTPUT_UF2=y
+
+# USB HID
+CONFIG_ZMK_USB=y
+
+# Settings Support
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+
+# Bootloader Support
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/extensions/adafruit_kb2040/adafruit_kb2040.conf

@@ -1,8 +0,0 @@
-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/extensions/adafruit_kb2040/adafruit_kb2040.overlay

@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
-
-&pro_micro_serial { status = "disabled"; };

app/boards/extensions/adafruit_qt_py_rp2040/adafruit_qt_py_rp2040.conf

@@ -1,8 +0,0 @@
-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/extensions/blackpill_f401cc/blackpill_f401cc.conf

@@ -1,6 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_KSCAN_MATRIX_POLLING=y

app/boards/extensions/blackpill_f401ce/blackpill_f401ce.conf

@@ -1,6 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_KSCAN_MATRIX_POLLING=y

app/boards/extensions/blackpill_f411ce/blackpill_f411ce.conf

@@ -1,6 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_KSCAN_MATRIX_POLLING=y

app/boards/extensions/boardsource_blok/boardsource_blok.conf

@@ -1,8 +0,0 @@
-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/extensions/native_sim/native_sim_64.overlay

@@ -1,32 +0,0 @@
-
-#include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/kscan_mock.h>
-
-/ {
-    chosen {
-        zephyr,console = &uart0;
-        zmk,kscan = &kscan;
-    };
-
-    kscan: native_posix_64_kscan_mock {
-        compatible = "zmk,kscan-mock";
-
-        rows = <2>;
-        columns = <2>;
-        exit-after;
-    };
-
-    uart0: uart {
-        status = "okay";
-        compatible = "zephyr,native-posix-uart";
-        /* Dummy current-speed entry to comply with serial
-         * DTS binding
-         */
-        current-speed = <0>;
-    };
-};
-
-&sdl_dc {
-    width = <128>;
-    height = <32>;
-};

app/boards/extensions/nrf52840dongle/nrf52840dongle_nrf52840.conf

@@ -1,12 +0,0 @@
-# Copyright (c) 2025 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-CONFIG_ZMK_BLE=y
-CONFIG_ZMK_USB=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y

app/boards/extensions/nrf_bsim/nrf52_bsim.conf

@@ -1,4 +0,0 @@
-CONFIG_ZMK_BLE=y
-CONFIG_LOG=y
-CONFIG_LOG_BACKEND_SHOW_COLOR=n
-CONFIG_ZMK_LOG_LEVEL_DBG=y

app/boards/extensions/rp2040_042lcd/01space_rp2040_042lcd.conf

@@ -1,6 +0,0 @@
-CONFIG_ZMK_DISPLAY=y
-CONFIG_LV_FONT_UNSCII_8=n
-CONFIG_ZMK_USB=y
-CONFIG_I2C=y
-CONFIG_I2C_DW=y
-CONFIG_LV_Z_VDB_SIZE=50

app/boards/extensions/rp2040_042lcd/01space_rp2040_042lcd.overlay

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-&xiao_serial { status = "disabled"; };

app/boards/extensions/rpi_pico/rpi_pico.conf

@@ -1,16 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
-
-CONFIG_RETAINED_MEM=y
-CONFIG_RETENTION=y
-CONFIG_RETENTION_BOOT_MODE=y

app/boards/extensions/seeeduino_xiao/seeeduino_xiao.conf

@@ -1,5 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y

app/boards/extensions/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.conf

@@ -1,15 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_ZMK_USB=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
-
-CONFIG_RETAINED_MEM=y
-CONFIG_RETENTION=y
-CONFIG_RETENTION_BOOT_MODE=y

app/boards/extensions/xiao_rp2040/xiao_rp2040.conf

@@ -1,15 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_ZMK_USB=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
-
-CONFIG_RETAINED_MEM=y
-CONFIG_RETENTION=y
-CONFIG_RETENTION_BOOT_MODE=y

app/boards/joric/nrfmicro/Kconfig.nrfmicro

@@ -4,9 +4,10 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_NRFMICRO
-    select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840
-    select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_FLIPPED
-    select SOC_NRF52833_QIAA if BOARD_NRFMICRO_NRF52833
-    imply RETAINED_MEM
-    imply RETENTION
-    imply RETENTION_BOOT_MODE
+    select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_ZMK
+    select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK
+    select SOC_NRF52833_QIAA if BOARD_NRFMICRO_NRF52833_ZMK
+    select ZMK_BOARD_COMPAT if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK
+    imply RETAINED_MEM if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK
+    imply RETENTION if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK

app/boards/joric/nrfmicro/board.yml

@@ -1,14 +1,9 @@
 board:
-  name: nrfmicro
-  vendor: joric
-  socs:
-    - name: nrf52840
-      variants:
-        - name: flipped
-    - name: nrf52833
-  revision:
-    format: major.minor.patch
-    default: 1.3.0
-    revisions:
-      - name: 1.3.0
-      - name: 1.1.0
+  extend: nrfmicro
+  variants:
+    - name: zmk
+      qualifier: nrf52840
+    - name: flipped_zmk
+      qualifier: nrf52840
+    - name: zmk
+      qualifier: nrf52833

app/boards/joric/nrfmicro/nrfmicro_nrf52833.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: nrfmicro/nrf52833
+id: nrfmicro/nrf52833/zmk
 name: nRFMicro (nRF52833)
 type: board
 arch: arm

app/boards/joric/nrfmicro/nrfmicro_nrf52833_zmk.dts

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/joric/nrfmicro/nrfmicro_nrf52833.dts>
+#include <common/nordic/nrf52833_uf2_boot_mode.dtsi>
+
+/ {
+    chosen {
+        zmk,battery = &vbatt;
+    };
+
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+        init-delay-ms = <50>;
+    };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
+};
+

app/boards/joric/nrfmicro/nrfmicro_nrf52840.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: nrfmicro/nrf52840
+id: nrfmicro/nrf52840/zmk
 name: nRFMicro (nRF52840) 1.1/1.2/1.3
 type: board
 arch: arm

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: nrfmicro/nrf52840/flipped
+id: nrfmicro/nrf52840/flipped_zmk
 name: nRFMicro nRF52840 (flipped)
 type: board
 arch: arm

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped_1_1_0.overlay

@@ -1,6 +0,0 @@
-/*
- * Copyright (c) 2020 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped_zmk.dts

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/joric/nrfmicro/nrfmicro_nrf52840_flipped.dts>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
+
+/ {
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+        init-delay-ms = <50>;
+    };
+};

app/boards/joric/nrfmicro/nrfmicro_nrf52840_zmk.dts

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/joric/nrfmicro/nrfmicro_nrf52840.dts>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
+
+/ {
+
+    chosen {
+        zmk,battery = &vbatt;
+    };
+
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+        init-delay-ms = <50>;
+    };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
+};

app/boards/jpconstantineau/bluemicro840/Kconfig.bluemicro840

@@ -1,8 +1,9 @@
-# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# Copyright (c) 2026 Pete Johanson, Derek Schmell
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BLUEMICRO840
     select SOC_NRF52840_QIAA
-    imply RETAINED_MEM
-    imply RETENTION
-    imply RETENTION_BOOT_MODE
+    select ZMK_BOARD_COMPAT if BOARD_BLUEMICRO840_NRF52840_ZMK
+    imply RETAINED_MEM if BOARD_BLUEMICRO840_NRF52840_ZMK
+    imply RETENTION if BOARD_BLUEMICRO840_NRF52840_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_BLUEMICRO840_NRF52840_ZMK

app/boards/jpconstantineau/bluemicro840/bluemicro840.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: bluemicro840
+id: bluemicro840//zmk
 name: BlueMicro840 v1
 type: board
 arch: arm

app/boards/jpconstantineau/bluemicro840/bluemicro840_nrf52840_zmk.dts

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 Pete Johanson, Derek Schmell
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/jpconstantineau/bluemicro840/bluemicro840.dts>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
+
+/ {
+    chosen {
+        zmk,battery = &vbatt;
+    };
+
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        init-delay-ms = <20>;
+        control-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+    };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 7>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 806000)>;
+    };
+
+};

app/boards/jpconstantineau/bluemicro840/board.yml

@@ -1,5 +1,5 @@
 board:
-  name: bluemicro840
-  vendor: jpconstantineau
-  socs:
-    - name: nrf52840
+  extend: bluemicro840
+  variants:
+    - name: zmk
+      qualifier: nrf52840

app/boards/kbdfans/tofu65/Kconfig.tofu65

@@ -3,6 +3,7 @@
 
 config BOARD_TOFU65
     select SOC_RP2040
+    select ZMK_BOARD_COMPAT
     imply RETAINED_MEM
     imply RETENTION
     imply RETENTION_BOOT_MODE

app/boards/kbdfans/tofu65/board.yml

@@ -3,3 +3,5 @@ board:
   vendor: kbdfans
   socs:
     - name: rp2040
+      variants:
+        - name: zmk

app/boards/kbdfans/tofu65/tofu65.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: tofu65
+id: tofu65//zmk
 name: KBDfans Tofu65 2.0
 type: board
 arch: arm

app/boards/keebio/bdn9/Kconfig.bdn9

@@ -3,3 +3,4 @@
 
 config BOARD_BDN9
     select SOC_STM32F072XB
+    select ZMK_BOARD_COMPAT

app/boards/keebio/bdn9/bdn9.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: bdn9
+id: bdn9//zmk
 name: BDN9 (Rev2)
 type: board
 arch: arm

app/boards/keebio/bdn9/board.yml

@@ -3,6 +3,8 @@ board:
   vendor: keebio
   socs:
     - name: stm32f072xb
+      variants:
+        - name: zmk
   revision:
     format: major.minor.patch
     default: 2.0.0

app/boards/keycapsss/puchi_ble/Kconfig.defconfig

@@ -3,9 +3,6 @@
 
 if BOARD_PUCHI_BLE
 
-config BOARD
-    default "puchi_ble"
-
 if USB_DEVICE_STACK
 
 config USB_NRFX
@@ -13,7 +10,4 @@ config USB_NRFX
 
 endif # USB_DEVICE_STACK
 
-config BT_CTLR
-    default BT
-
 endif # BOARD_PUCHI_BLE

app/boards/keycapsss/puchi_ble/Kconfig.puchi_ble

@@ -5,6 +5,7 @@
 
 config BOARD_PUCHI_BLE
     select SOC_NRF52840_QIAA
-    imply RETAINED_MEM
-    imply RETENTION
-    imply RETENTION_BOOT_MODE
+    select ZMK_BOARD_COMPAT if BOARD_PUCHI_BLE_NRF52840_ZMK
+    imply RETAINED_MEM if BOARD_PUCHI_BLE_NRF52840_ZMK
+    imply RETENTION if BOARD_PUCHI_BLE_NRF52840_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_PUCHI_BLE_NRF52840_ZMK

app/boards/keycapsss/puchi_ble/board.yml

@@ -1,5 +1,5 @@
 board:
-  name: puchi_ble
-  vendor: keycapsss
-  socs:
-    - name: nrf52840
+  extend: puchi_ble
+  variants:
+    - name: zmk
+      qualifier: nrf52840

app/boards/keycapsss/puchi_ble/puchi_ble.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: puchi_ble
+id: puchi_ble//zmk
 name: Puchi-BLE V1
 type: board
 arch: arm

app/boards/keycapsss/puchi_ble/puchi_ble_nrf52840_zmk.dts

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/keycapsss/puchi_ble/puchi_ble.dts>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
+
+
+/ {
+    chosen {
+        zmk,battery = &vbatt;
+    };
+
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+    };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
+};
+

app/boards/kinesis/adv360pro/Kconfig.adv360pro_left

@@ -5,6 +5,7 @@
 
 config BOARD_ADV360PRO_LEFT
     select SOC_NRF52840_QIAA
+    select ZMK_BOARD_COMPAT
     imply RETAINED_MEM
     imply RETENTION
-    imply RETENTION_BOOT_MODE
+    imply RETENTION_BOOT_MODE

app/boards/kinesis/adv360pro/Kconfig.adv360pro_right

@@ -5,6 +5,7 @@
 
 config BOARD_ADV360PRO_RIGHT
     select SOC_NRF52840_QIAA
+    select ZMK_BOARD_COMPAT
     imply RETAINED_MEM
     imply RETENTION
-    imply RETENTION_BOOT_MODE
+    imply RETENTION_BOOT_MODE

app/boards/kinesis/adv360pro/adv360pro.zmk.yml

@@ -13,5 +13,5 @@ outputs:
   - usb
   - ble
 siblings:
-  - adv360pro_left
-  - adv360pro_right
+  - adv360pro_left//zmk
+  - adv360pro_right//zmk

app/boards/kinesis/adv360pro/board.yml

@@ -3,7 +3,11 @@ boards:
     vendor: kinesis
     socs:
       - name: nrf52840
+        variants:
+          - name: zmk
   - name: adv360pro_right
     vendor: kinesis
     socs:
       - name: nrf52840
+        variants:
+          - name: zmk

app/boards/lowprokb/corneish_zen/Kconfig.corneish_zen_left

@@ -5,6 +5,7 @@
 
 config BOARD_CORNEISH_ZEN_LEFT
     select SOC_NRF52840_QIAA
+    select ZMK_BOARD_COMPAT
     imply RETAINED_MEM
     imply RETENTION
     imply RETENTION_BOOT_MODE

app/boards/lowprokb/corneish_zen/Kconfig.corneish_zen_right

@@ -5,6 +5,7 @@
 
 config BOARD_CORNEISH_ZEN_RIGHT
     select SOC_NRF52840_QIAA
+    select ZMK_BOARD_COMPAT
     imply RETAINED_MEM
     imply RETENTION
     imply RETENTION_BOOT_MODE

app/boards/lowprokb/corneish_zen/board.yml

@@ -3,6 +3,8 @@ boards:
     vendor: lowprokb
     socs:
       - name: nrf52840
+        variants:
+          - name: zmk
     revision:
       format: major.minor.patch
       default: 2.0.0
@@ -14,6 +16,8 @@ boards:
     vendor: lowprokb
     socs:
       - name: nrf52840
+        variants:
+          - name: zmk
     revision:
       format: major.minor.patch
       default: 2.0.0

app/boards/lowprokb/corneish_zen/corneish_zen.zmk.yml

@@ -15,5 +15,5 @@ revisions:
   - 2.0.0
   - 1.0.0
 siblings:
-  - corneish_zen_left
-  - corneish_zen_right
+  - corneish_zen_left//zmk
+  - corneish_zen_right//zmk

app/boards/lowprokb/corneish_zen/widgets/output_status.c

@@ -45,7 +45,7 @@ struct output_status_state {
 
 static struct output_status_state get_state(const zmk_event_t *_eh) {
     return (struct output_status_state){
-        .selected_endpoint = zmk_endpoints_selected(),
+        .selected_endpoint = zmk_endpoint_get_selected(),
         .active_profile_connected = zmk_ble_active_profile_is_connected(),
         .active_profile_bonded = !zmk_ble_active_profile_is_open(),
     };

app/boards/makerdiary/nrf52840_m2/Kconfig.nrf52840_m2

@@ -3,6 +3,7 @@
 
 config BOARD_NRF52840_M2
     select SOC_NRF52840_QIAA
-    imply RETAINED_MEM
-    imply RETENTION
-    imply RETENTION_BOOT_MODE
+    select ZMK_BOARD_COMPAT if BOARD_NRF52840_M2_NRF52840_ZMK
+    imply RETAINED_MEM if BOARD_NRF52840_M2_NRF52840_ZMK
+    imply RETENTION if BOARD_NRF52840_M2_NRF52840_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_NRF52840_M2_NRF52840_ZMK