From 1783414f706bb3e30cd111126a072e03c32c029c Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Mon, 2 Jun 2025 01:39:42 -0600 Subject: [PATCH] refactor(boards): Move nice!60 to HWMv2 Migrate nice!60 to HWMv2. --- app/boards/arm/nice60/Kconfig.board | 6 ------ app/boards/{arm => nicekeyboards}/nice60/Kconfig | 0 .../{arm => nicekeyboards}/nice60/Kconfig.defconfig | 0 app/boards/nicekeyboards/nice60/Kconfig.nice60 | 5 +++++ app/boards/{arm => nicekeyboards}/nice60/README.md | 0 app/boards/{arm => nicekeyboards}/nice60/board.cmake | 0 app/boards/nicekeyboards/nice60/board.yml | 5 +++++ .../{arm => nicekeyboards}/nice60/nice60-pinctrl.dtsi | 0 app/boards/{arm => nicekeyboards}/nice60/nice60.dts | 4 ++++ app/boards/{arm => nicekeyboards}/nice60/nice60.keymap | 0 app/boards/{arm => nicekeyboards}/nice60/nice60.yaml | 0 app/boards/{arm => nicekeyboards}/nice60/nice60.zmk.yml | 0 .../{arm => nicekeyboards}/nice60/nice60_defconfig | 9 ++------- .../{arm => nicekeyboards}/nice60/pre_dt_board.cmake | 0 14 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 app/boards/arm/nice60/Kconfig.board rename app/boards/{arm => nicekeyboards}/nice60/Kconfig (100%) rename app/boards/{arm => nicekeyboards}/nice60/Kconfig.defconfig (100%) create mode 100644 app/boards/nicekeyboards/nice60/Kconfig.nice60 rename app/boards/{arm => nicekeyboards}/nice60/README.md (100%) rename app/boards/{arm => nicekeyboards}/nice60/board.cmake (100%) create mode 100644 app/boards/nicekeyboards/nice60/board.yml rename app/boards/{arm => nicekeyboards}/nice60/nice60-pinctrl.dtsi (100%) rename app/boards/{arm => nicekeyboards}/nice60/nice60.dts (98%) rename app/boards/{arm => nicekeyboards}/nice60/nice60.keymap (100%) rename app/boards/{arm => nicekeyboards}/nice60/nice60.yaml (100%) rename app/boards/{arm => nicekeyboards}/nice60/nice60.zmk.yml (100%) rename app/boards/{arm => nicekeyboards}/nice60/nice60_defconfig (79%) rename app/boards/{arm => nicekeyboards}/nice60/pre_dt_board.cmake (100%) diff --git a/app/boards/arm/nice60/Kconfig.board b/app/boards/arm/nice60/Kconfig.board deleted file mode 100644 index 88db9ee86..000000000 --- a/app/boards/arm/nice60/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Nick Winans -# SPDX-License-Identifier: MIT - -config BOARD_NICE60 - bool "nice!60" - depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/nice60/Kconfig b/app/boards/nicekeyboards/nice60/Kconfig similarity index 100% rename from app/boards/arm/nice60/Kconfig rename to app/boards/nicekeyboards/nice60/Kconfig diff --git a/app/boards/arm/nice60/Kconfig.defconfig b/app/boards/nicekeyboards/nice60/Kconfig.defconfig similarity index 100% rename from app/boards/arm/nice60/Kconfig.defconfig rename to app/boards/nicekeyboards/nice60/Kconfig.defconfig diff --git a/app/boards/nicekeyboards/nice60/Kconfig.nice60 b/app/boards/nicekeyboards/nice60/Kconfig.nice60 new file mode 100644 index 000000000..1760b687b --- /dev/null +++ b/app/boards/nicekeyboards/nice60/Kconfig.nice60 @@ -0,0 +1,5 @@ +# Copyright (c) 2021 Nick Winans +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NICE60 + select SOC_NRF52840_QIAA diff --git a/app/boards/arm/nice60/README.md b/app/boards/nicekeyboards/nice60/README.md similarity index 100% rename from app/boards/arm/nice60/README.md rename to app/boards/nicekeyboards/nice60/README.md diff --git a/app/boards/arm/nice60/board.cmake b/app/boards/nicekeyboards/nice60/board.cmake similarity index 100% rename from app/boards/arm/nice60/board.cmake rename to app/boards/nicekeyboards/nice60/board.cmake diff --git a/app/boards/nicekeyboards/nice60/board.yml b/app/boards/nicekeyboards/nice60/board.yml new file mode 100644 index 000000000..fdbe7cef1 --- /dev/null +++ b/app/boards/nicekeyboards/nice60/board.yml @@ -0,0 +1,5 @@ +board: + name: nice60 + vendor: nicekeyboards + socs: + - name: nrf52840 diff --git a/app/boards/arm/nice60/nice60-pinctrl.dtsi b/app/boards/nicekeyboards/nice60/nice60-pinctrl.dtsi similarity index 100% rename from app/boards/arm/nice60/nice60-pinctrl.dtsi rename to app/boards/nicekeyboards/nice60/nice60-pinctrl.dtsi diff --git a/app/boards/arm/nice60/nice60.dts b/app/boards/nicekeyboards/nice60/nice60.dts similarity index 98% rename from app/boards/arm/nice60/nice60.dts rename to app/boards/nicekeyboards/nice60/nice60.dts index 35eececd4..7da97ff4f 100644 --- a/app/boards/arm/nice60/nice60.dts +++ b/app/boards/nicekeyboards/nice60/nice60.dts @@ -92,6 +92,10 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,5) R }; }; +®1 { + regulator-initial-mode = ; +}; + &adc { status = "okay"; }; diff --git a/app/boards/arm/nice60/nice60.keymap b/app/boards/nicekeyboards/nice60/nice60.keymap similarity index 100% rename from app/boards/arm/nice60/nice60.keymap rename to app/boards/nicekeyboards/nice60/nice60.keymap diff --git a/app/boards/arm/nice60/nice60.yaml b/app/boards/nicekeyboards/nice60/nice60.yaml similarity index 100% rename from app/boards/arm/nice60/nice60.yaml rename to app/boards/nicekeyboards/nice60/nice60.yaml diff --git a/app/boards/arm/nice60/nice60.zmk.yml b/app/boards/nicekeyboards/nice60/nice60.zmk.yml similarity index 100% rename from app/boards/arm/nice60/nice60.zmk.yml rename to app/boards/nicekeyboards/nice60/nice60.zmk.yml diff --git a/app/boards/arm/nice60/nice60_defconfig b/app/boards/nicekeyboards/nice60/nice60_defconfig similarity index 79% rename from app/boards/arm/nice60/nice60_defconfig rename to app/boards/nicekeyboards/nice60/nice60_defconfig index fabcb7edd..6bf5757c3 100644 --- a/app/boards/arm/nice60/nice60_defconfig +++ b/app/boards/nicekeyboards/nice60/nice60_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021 Nick Winans # SPDX-License-Identifier: MIT -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NICE60=y - # Enable MPU CONFIG_ARM_MPU=y @@ -24,11 +20,10 @@ CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_ZMK_RGB_UNDERGLOW=y -CONFIG_WS2812_STRIP=y +#CONFIG_WS2812_STRIP=y CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=160 CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3 - CONFIG_ZMK_USB=y -CONFIG_ZMK_BLE=y \ No newline at end of file +CONFIG_ZMK_BLE=y diff --git a/app/boards/arm/nice60/pre_dt_board.cmake b/app/boards/nicekeyboards/nice60/pre_dt_board.cmake similarity index 100% rename from app/boards/arm/nice60/pre_dt_board.cmake rename to app/boards/nicekeyboards/nice60/pre_dt_board.cmake