chore(deps-dev): bump globals from 16.5.0 to 17.0.0 in /docs

Bumps [globals](https://github.com/sindresorhus/globals) from 16.5.0 to 17.0.0.
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](https://github.com/sindresorhus/globals/compare/v16.5.0...v17.0.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-version: 17.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

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

@@ -147,29 +147,6 @@ 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" ]

.github/workflows/build.yml

@@ -61,7 +61,7 @@ jobs:
         with:
           node-version: "14.x"
       - name: Install @actions/artifact
-        run: npm install @actions/artifact@5.0.3
+        run: npm install @actions/artifact
       - name: Build
         uses: actions/github-script@v7
         id: boards-list
@@ -277,7 +277,6 @@ jobs:
                       );
                     } else {
                       console.error("Board without keys or interconnect");
-                      return [];
                     }
                     break;
                   case "shield":

app/Kconfig

@@ -5,17 +5,6 @@ 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

@@ -1,9 +0,0 @@
-# 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//zmk
+id: adafruit_kb2040
 name: Adafruit KB2040
 type: board
 arch: arm

app/boards/adafruit/kb2040/adafruit_kb2040_zmk_defconfig

@@ -1,23 +0,0 @@
-# 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

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

app/boards/adafruit/qt_py_rp2040/Kconfig.adafruit_qt_py_rp2040

@@ -1,9 +0,0 @@
-# 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//zmk
+id: adafruit_qt_py_rp2040
 name: Adafruit QT Py RP2040
 type: board
 arch: arm

app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk_defconfig

@@ -1,23 +0,0 @@
-# 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

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

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

@@ -0,0 +1,9 @@
+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

@@ -1,9 +0,0 @@
-# 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

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

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

@@ -1,9 +0,0 @@
-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

@@ -1,23 +0,0 @@
-/*
- * 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

@@ -1,30 +0,0 @@
-# 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

@@ -0,0 +1,8 @@
+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

@@ -4,7 +4,6 @@
  * 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/extensions/adafruit_qt_py_rp2040/adafruit_qt_py_rp2040.conf

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

@@ -4,7 +4,6 @@
  * 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/extensions/blackpill_f401cc/blackpill_f401cc.conf

@@ -0,0 +1,6 @@
+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_f401cc/blackpill_f401cc.overlay

@@ -1,11 +1,9 @@
 /*
- * Copyright (c) 2026 The ZMK Contributors
+ * Copyright (c) 2024 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
 
-#include <../boards/weact/blackpill_f401ce/blackpill_f401ce.dts>
-
 / {
     blackpill: connector {
         compatible = "blackpill";

app/boards/extensions/blackpill_f401ce/blackpill_f401ce.conf

@@ -0,0 +1,6 @@
+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.overlay

@@ -1,10 +1,9 @@
 /*
- * Copyright (c) 2026 The ZMK Contributors
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
 
-#include <../boards/weact/blackpill_f411ce/blackpill_f411ce.dts>
 
 / {
     blackpill: connector {

app/boards/extensions/blackpill_f411ce/blackpill_f411ce.conf

@@ -0,0 +1,6 @@
+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.overlay

@@ -1,10 +1,9 @@
 /*
- * Copyright (c) 2026 The ZMK Contributors
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
 
-#include <../boards/weact/blackpill_f401cc/blackpill_f401cc.dts>
 
 / {
     blackpill: connector {

app/boards/extensions/boardsource_blok/boardsource_blok.conf

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

@@ -0,0 +1,9 @@
+/*
+ * 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/native_sim/native_sim.overlay

@@ -1,10 +1,10 @@
 
-#include <../boards/native/native_sim/native_sim.dts>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/kscan_mock.h>
 
 / {
     chosen {
+        zephyr,console = &uart0;
         zmk,kscan = &kscan;
     };
 
@@ -15,5 +15,13 @@
         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>;
+    };
+};

app/boards/extensions/native_sim/native_sim_64.overlay

@@ -0,0 +1,32 @@
+
+#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/native_sim/native_sim_native_64.conf

@@ -1,8 +1,6 @@
-# SPDX-License-Identifier: MIT
-
-CONFIG_CONSOLE=y
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
-
+CONFIG_GPIO=n
+# Enable to have the native posix build expose USBIP device(s)
+# CONFIG_ZMK_USB=y
 CONFIG_LOG=y
 CONFIG_LOG_BACKEND_SHOW_COLOR=n
 CONFIG_ZMK_LOG_LEVEL_DBG=y

app/boards/extensions/nrf52840dk/nrf52840dk_nrf52840.conf

@@ -1,20 +1,9 @@
 # Copyright (c) 2022 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# USB and BLE HID
 CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y
 
-# Settings Support
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
 CONFIG_SETTINGS_NVS=y

app/boards/extensions/nrf52840dongle/nrf52840dongle_nrf52840.conf

@@ -0,0 +1,12 @@
+# 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

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

app/boards/extensions/nrf_bsim/nrf52_bsim.overlay

@@ -1,5 +1,3 @@
-#include <../boards/native/nrf_bsim/nrf52_bsim.dts>
-
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/kscan_mock.h>

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

@@ -0,0 +1,6 @@
+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

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

app/boards/extensions/rpi_pico/rpi_pico.conf

@@ -0,0 +1,16 @@
+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/rpi_pico/rpi_pico.overlay

@@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2026 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <../boards/raspberrypi/rpi_pico/rpi_pico.dts>
 #include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
 
 &uart0 { status = "disabled"; };

app/boards/extensions/seeeduino_xiao/seeeduino_xiao.conf

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,15 @@
+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/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.overlay

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

app/boards/extensions/xiao_ble/xiao_ble.conf

@@ -1,21 +1,12 @@
 
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
+CONFIG_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y
 
-# Build UF2 by default, supported by the Adafruit nRF52 Bootloader
-CONFIG_BUILD_OUTPUT_UF2=y
-CONFIG_USE_DT_CODE_PARTITION=y
 
-# Settings Support
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
 CONFIG_SETTINGS_NVS=y
@@ -23,7 +14,6 @@ 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/xiao_ble/xiao_ble.overlay

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <../boards/seeed/xiao_ble/xiao_ble.dts>
 #include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
 
 /* Add an sd_partition label for compatibility with the nosd snippet */

app/boards/extensions/xiao_rp2040/xiao_rp2040.conf

@@ -0,0 +1,15 @@
+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.overlay

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

app/boards/joric/nrfmicro/Kconfig.nrfmicro

@@ -4,10 +4,9 @@
 # SPDX-License-Identifier: MIT
 
 config BOARD_NRFMICRO
-    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
+    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

app/boards/joric/nrfmicro/board.yml

@@ -1,9 +1,14 @@
 board:
-  extend: nrfmicro
-  variants:
-    - name: zmk
-      qualifier: nrf52840
-    - name: flipped_zmk
-      qualifier: nrf52840
-    - name: zmk
-      qualifier: nrf52833
+  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

app/boards/joric/nrfmicro/nrfmicro_nrf52833.dts

@@ -19,6 +19,7 @@
         zephyr,code-partition = &code_partition;
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
+        zmk,battery = &vbatt;
     };
 
     leds {
@@ -27,6 +28,20 @@
             gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
         };
     };
+
+    // 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)>;
+    };
 };
 
 &reg1 {

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

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

app/boards/joric/nrfmicro/nrfmicro_nrf52833_zmk.dts

@@ -1,29 +0,0 @@
-/*
- * 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.dts

@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
 
 #include "arduino_pro_micro_pins.dtsi"
 #include "nrfmicro-pinctrl.dtsi"
@@ -18,6 +19,7 @@
         zephyr,code-partition = &code_partition;
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
+        zmk,battery = &vbatt;
     };
 
     leds {
@@ -26,6 +28,20 @@
             gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
         };
     };
+
+    // 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)>;
+    };
 };
 
 &reg1 {
@@ -74,6 +90,7 @@ zephyr_udc0: &usbd {
     status = "okay";
 };
 
+
 &flash0 {
     /*
      * For more information, see:

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

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

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped.dts

@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
 
 #include "arduino_pro_micro_pins_flipped.dtsi"
 #include "nrfmicro-flipped-pinctrl.dtsi"
@@ -26,6 +27,13 @@
             gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
         };
     };
+
+    // 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>;
+    };
 };
 
 &reg1 {

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

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

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped_1_1_0.overlay

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

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped_zmk.dts

@@ -1,17 +0,0 @@
-/*
- * 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

@@ -1,29 +0,0 @@
-/*
- * 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,9 +1,8 @@
-# Copyright (c) 2026 Pete Johanson, Derek Schmell
+# Copyright (c) 2020 Pete Johanson, Derek Schmell
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BLUEMICRO840
     select SOC_NRF52840_QIAA
-    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
+    imply RETAINED_MEM
+    imply RETENTION
+    imply RETENTION_BOOT_MODE

app/boards/jpconstantineau/bluemicro840/bluemicro840.dts

@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
 
 #include "arduino_pro_micro_pins.dtsi"
 #include "bluemicro840-pinctrl.dtsi"
@@ -18,6 +19,7 @@
         zephyr,code-partition = &code_partition;
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
+        zmk,battery = &vbatt;
     };
 
     leds {
@@ -26,6 +28,21 @@
             gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
         };
     };
+
+    // 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)>;
+    };
+
 };
 
 &adc {

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

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

app/boards/jpconstantineau/bluemicro840/bluemicro840_nrf52840_zmk.dts

@@ -1,29 +0,0 @@
-/*
- * 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:
-  extend: bluemicro840
-  variants:
-    - name: zmk
-      qualifier: nrf52840
+  name: bluemicro840
+  vendor: jpconstantineau
+  socs:
+    - name: nrf52840

app/boards/kbdfans/tofu65/Kconfig.tofu65

@@ -3,7 +3,6 @@
 
 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,5 +3,3 @@ 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//zmk
+id: tofu65
 name: KBDfans Tofu65 2.0
 type: board
 arch: arm

app/boards/keebio/bdn9/Kconfig.bdn9

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