From 9502b437d7fb9d28f28e089ebaad32f1d303fa76 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Thu, 3 Jul 2025 01:37:04 -0600 Subject: [PATCH] refactor(boards): Move Pillbug to HWMv2 Migrate the MechWild PillBug board to HWMv2. --- app/boards/arm/pillbug/Kconfig.board | 6 ------ app/boards/{arm => mechwild}/pillbug/Kconfig | 0 app/boards/{arm => mechwild}/pillbug/Kconfig.defconfig | 3 --- app/boards/mechwild/pillbug/Kconfig.pillbug | 8 ++++++++ app/boards/{arm => mechwild}/pillbug/blackpill_pins.dtsi | 0 app/boards/{arm => mechwild}/pillbug/board.cmake | 0 app/boards/mechwild/pillbug/board.yml | 5 +++++ app/boards/{arm => mechwild}/pillbug/pillbug-pinctrl.dtsi | 0 app/boards/{arm => mechwild}/pillbug/pillbug.dts | 2 ++ app/boards/{arm => mechwild}/pillbug/pillbug.yaml | 0 app/boards/{arm => mechwild}/pillbug/pillbug.zmk.yml | 0 app/boards/{arm => mechwild}/pillbug/pillbug_defconfig | 4 ---- app/boards/{arm => mechwild}/pillbug/pre_dt_board.cmake | 0 13 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 app/boards/arm/pillbug/Kconfig.board rename app/boards/{arm => mechwild}/pillbug/Kconfig (100%) rename app/boards/{arm => mechwild}/pillbug/Kconfig.defconfig (86%) create mode 100644 app/boards/mechwild/pillbug/Kconfig.pillbug rename app/boards/{arm => mechwild}/pillbug/blackpill_pins.dtsi (100%) rename app/boards/{arm => mechwild}/pillbug/board.cmake (100%) create mode 100644 app/boards/mechwild/pillbug/board.yml rename app/boards/{arm => mechwild}/pillbug/pillbug-pinctrl.dtsi (100%) rename app/boards/{arm => mechwild}/pillbug/pillbug.dts (97%) rename app/boards/{arm => mechwild}/pillbug/pillbug.yaml (100%) rename app/boards/{arm => mechwild}/pillbug/pillbug.zmk.yml (100%) rename app/boards/{arm => mechwild}/pillbug/pillbug_defconfig (79%) rename app/boards/{arm => mechwild}/pillbug/pre_dt_board.cmake (100%) diff --git a/app/boards/arm/pillbug/Kconfig.board b/app/boards/arm/pillbug/Kconfig.board deleted file mode 100644 index 70232e18a..000000000 --- a/app/boards/arm/pillbug/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 The ZMK Contributors -# SPDX-License-Identifier: MIT - -config BOARD_PILLBUG - bool "PillBug" - depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/pillbug/Kconfig b/app/boards/mechwild/pillbug/Kconfig similarity index 100% rename from app/boards/arm/pillbug/Kconfig rename to app/boards/mechwild/pillbug/Kconfig diff --git a/app/boards/arm/pillbug/Kconfig.defconfig b/app/boards/mechwild/pillbug/Kconfig.defconfig similarity index 86% rename from app/boards/arm/pillbug/Kconfig.defconfig rename to app/boards/mechwild/pillbug/Kconfig.defconfig index 48427ed3e..e29ed6789 100644 --- a/app/boards/arm/pillbug/Kconfig.defconfig +++ b/app/boards/mechwild/pillbug/Kconfig.defconfig @@ -3,9 +3,6 @@ if BOARD_PILLBUG -config BOARD - default "PillBug" - if USB_DEVICE_STACK config USB_NRFX diff --git a/app/boards/mechwild/pillbug/Kconfig.pillbug b/app/boards/mechwild/pillbug/Kconfig.pillbug new file mode 100644 index 000000000..b8e0e1482 --- /dev/null +++ b/app/boards/mechwild/pillbug/Kconfig.pillbug @@ -0,0 +1,8 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PILLBUG + select SOC_NRF52840_QIAA + imply RETAINED_MEM + imply RETENTION + imply RETENTION_BOOT_MODE diff --git a/app/boards/arm/pillbug/blackpill_pins.dtsi b/app/boards/mechwild/pillbug/blackpill_pins.dtsi similarity index 100% rename from app/boards/arm/pillbug/blackpill_pins.dtsi rename to app/boards/mechwild/pillbug/blackpill_pins.dtsi diff --git a/app/boards/arm/pillbug/board.cmake b/app/boards/mechwild/pillbug/board.cmake similarity index 100% rename from app/boards/arm/pillbug/board.cmake rename to app/boards/mechwild/pillbug/board.cmake diff --git a/app/boards/mechwild/pillbug/board.yml b/app/boards/mechwild/pillbug/board.yml new file mode 100644 index 000000000..abd15044f --- /dev/null +++ b/app/boards/mechwild/pillbug/board.yml @@ -0,0 +1,5 @@ +board: + name: pillbug + vendor: mechwild + socs: + - name: nrf52840 diff --git a/app/boards/arm/pillbug/pillbug-pinctrl.dtsi b/app/boards/mechwild/pillbug/pillbug-pinctrl.dtsi similarity index 100% rename from app/boards/arm/pillbug/pillbug-pinctrl.dtsi rename to app/boards/mechwild/pillbug/pillbug-pinctrl.dtsi diff --git a/app/boards/arm/pillbug/pillbug.dts b/app/boards/mechwild/pillbug/pillbug.dts similarity index 97% rename from app/boards/arm/pillbug/pillbug.dts rename to app/boards/mechwild/pillbug/pillbug.dts index cf4f62fc9..cb2db7c46 100644 --- a/app/boards/arm/pillbug/pillbug.dts +++ b/app/boards/mechwild/pillbug/pillbug.dts @@ -7,6 +7,8 @@ /dts-v1/; #include +#include + #include "pillbug-pinctrl.dtsi" #include "blackpill_pins.dtsi" diff --git a/app/boards/arm/pillbug/pillbug.yaml b/app/boards/mechwild/pillbug/pillbug.yaml similarity index 100% rename from app/boards/arm/pillbug/pillbug.yaml rename to app/boards/mechwild/pillbug/pillbug.yaml diff --git a/app/boards/arm/pillbug/pillbug.zmk.yml b/app/boards/mechwild/pillbug/pillbug.zmk.yml similarity index 100% rename from app/boards/arm/pillbug/pillbug.zmk.yml rename to app/boards/mechwild/pillbug/pillbug.zmk.yml diff --git a/app/boards/arm/pillbug/pillbug_defconfig b/app/boards/mechwild/pillbug/pillbug_defconfig similarity index 79% rename from app/boards/arm/pillbug/pillbug_defconfig rename to app/boards/mechwild/pillbug/pillbug_defconfig index 9ec72c417..f325d3588 100644 --- a/app/boards/arm/pillbug/pillbug_defconfig +++ b/app/boards/mechwild/pillbug/pillbug_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022 The ZMK Contributors # SPDX-License-Identifier: MIT -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_PILLBUG=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/app/boards/arm/pillbug/pre_dt_board.cmake b/app/boards/mechwild/pillbug/pre_dt_board.cmake similarity index 100% rename from app/boards/arm/pillbug/pre_dt_board.cmake rename to app/boards/mechwild/pillbug/pre_dt_board.cmake