diff --git a/boards/ugl/uhk-80-left/Kconfig.board b/boards/ugl/uhk-80-left/Kconfig.board deleted file mode 100644 index ab0a2c5ba..000000000 --- a/boards/ugl/uhk-80-left/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UHK_80_LEFT - bool "UHK 80 left" - depends on SOC_NRF52840_QIAA diff --git a/boards/ugl/uhk-80-left/Kconfig.defconfig b/boards/ugl/uhk-80-left/Kconfig.defconfig deleted file mode 100644 index 402accf4a..000000000 --- a/boards/ugl/uhk-80-left/Kconfig.defconfig +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# used for both zephyr and mcuboot -> no custom kconfig symbols here -if BOARD_UHK_80_LEFT - -if SHELL_BACKEND_RTT -config SHELL_PROMPT_RTT - default "uhk80:left$ " -endif # SHELL_BACKEND_RTT - -if SHELL_BACKEND_SERIAL -config SHELL_PROMPT_UART - default "uhk80:left$ " -endif # SHELL_BACKEND_SERIAL - -if BT_DIS && BT_DIS_PNP -config BT_DIS_PNP_PID - default 0x8007 -endif # BT_DIS && BT_DIS_PNP - -config USB_DEVICE_PRODUCT - default "UHK 80 left half" - -config USB_DEVICE_PID - default 0x0007 - -config BT_CTLR - default BT - -endif # BOARD_UHK_80_LEFT diff --git a/boards/ugl/uhk-80-left/board.yml b/boards/ugl/uhk-80-left/board.yml deleted file mode 100644 index 3280b562d..000000000 --- a/boards/ugl/uhk-80-left/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: uhk-80-left - vendor: ugl - socs: - - name: nrf52840 diff --git a/boards/ugl/uhk-80-right/Kconfig.defconfig b/boards/ugl/uhk-80-right/Kconfig.defconfig deleted file mode 100644 index cdd77c304..000000000 --- a/boards/ugl/uhk-80-right/Kconfig.defconfig +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# used for both zephyr and mcuboot -> no custom kconfig symbols here -if BOARD_UHK_80_RIGHT - -if SHELL_BACKEND_RTT -config SHELL_PROMPT_RTT - default "uhk80:right$ " -endif # SHELL_BACKEND_RTT - -if SHELL_BACKEND_SERIAL -config SHELL_PROMPT_UART - default "uhk80:right$ " -endif # SHELL_BACKEND_SERIAL - -if BT_DIS && BT_DIS_PNP -config BT_DIS_PNP_PID - default 0x8009 -endif # BT_DIS && BT_DIS_PNP - -config USB_DEVICE_PRODUCT - default "UHK 80 right half" - -config USB_DEVICE_PID - default 0x0009 - -config BT_CTLR - default BT - -endif # BOARD_UHK_80_RIGHT diff --git a/boards/ugl/uhk-80-right/board.cmake b/boards/ugl/uhk-80-right/board.cmake deleted file mode 100644 index 5c6b5319f..000000000 --- a/boards/ugl/uhk-80-right/board.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2021 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -board_runner_args(jlink "--device=nrf52" "--speed=4000") -board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") - -set(OPENOCD_NRF5_SUBFAMILY "nrf52") - -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake) diff --git a/boards/ugl/uhk-80-right/board.yml b/boards/ugl/uhk-80-right/board.yml deleted file mode 100644 index c7335f7e6..000000000 --- a/boards/ugl/uhk-80-right/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: uhk-80-right - vendor: ugl - socs: - - name: nrf52840 diff --git a/boards/ugl/uhk-80-right/pre_dt_board.cmake b/boards/ugl/uhk-80-right/pre_dt_board.cmake deleted file mode 100644 index 3369c21d3..000000000 --- a/boards/ugl/uhk-80-right/pre_dt_board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - power@40000000 & clock@40000000 & bprot@40000000 -# - acl@4001e000 & flash-controller@4001e000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/ugl/uhk-80-right/Kconfig.board b/boards/ugl/uhk-80/Kconfig.board similarity index 50% rename from boards/ugl/uhk-80-right/Kconfig.board rename to boards/ugl/uhk-80/Kconfig.board index e29fdbeb0..cbbbab86f 100644 --- a/boards/ugl/uhk-80-right/Kconfig.board +++ b/boards/ugl/uhk-80/Kconfig.board @@ -1,6 +1,14 @@ # Copyright (c) 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 +config BOARD_UHK_80_LEFT + bool "UHK 80 left" + depends on SOC_NRF52840_QIAA + config BOARD_UHK_80_RIGHT bool "UHK 80 right" depends on SOC_NRF52840_QIAA + +config BOARD_UHK_DONGLE + bool "UHK dongle" + depends on SOC_NRF52840_QIAA diff --git a/boards/ugl/uhk-80/Kconfig.defconfig b/boards/ugl/uhk-80/Kconfig.defconfig new file mode 100644 index 000000000..55a1de238 --- /dev/null +++ b/boards/ugl/uhk-80/Kconfig.defconfig @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: Apache-2.0 +# used for both zephyr and mcuboot -> no custom kconfig symbols here + +if SHELL_BACKEND_RTT +if BOARD_UHK_80_LEFT +config SHELL_PROMPT_RTT + default "uhk80:left$ " +endif +if BOARD_UHK_80_RIGHT +config SHELL_PROMPT_RTT + default "uhk80:right$ " +endif +if BOARD_UHK_DONGLE +config SHELL_PROMPT_RTT + default "uhk-dongle$ " +endif +endif # SHELL_BACKEND_RTT + +if SHELL_BACKEND_SERIAL +if BOARD_UHK_80_LEFT +config SHELL_PROMPT_UART + default "uhk80:left$ " +endif +if BOARD_UHK_80_RIGHT +config SHELL_PROMPT_UART + default "uhk80:right$ " +endif +if BOARD_UHK_DONGLE +config SHELL_PROMPT_UART + default "uhk-dongle$ " +endif +endif # SHELL_BACKEND_SERIAL + +if BOARD_UHK_80_LEFT +config USB_DEVICE_PRODUCT + default "UHK 80 left half" +config USB_DEVICE_PID + default 0x0007 +if BT_DIS && BT_DIS_PNP +config BT_DIS_PNP_PID + default 0x8007 +endif # BT_DIS && BT_DIS_PNP +endif + +if BOARD_UHK_80_RIGHT +config USB_DEVICE_PRODUCT + default "UHK 80 right half" +config USB_DEVICE_PID + default 0x0009 +if BT_DIS && BT_DIS_PNP +config BT_DIS_PNP_PID + default 0x8009 +endif # BT_DIS && BT_DIS_PNP +endif + +if BOARD_UHK_DONGLE +config USB_DEVICE_PRODUCT + default "UHK dongle" +config USB_DEVICE_PID + default 0x0005 +if BT_DIS && BT_DIS_PNP +config BT_DIS_PNP_PID + default 0x8005 +endif # BT_DIS && BT_DIS_PNP +endif + +config BT_CTLR + default BT diff --git a/boards/ugl/uhk-80-left/Kconfig.uhk-80-left b/boards/ugl/uhk-80/Kconfig.uhk-80-left similarity index 100% rename from boards/ugl/uhk-80-left/Kconfig.uhk-80-left rename to boards/ugl/uhk-80/Kconfig.uhk-80-left diff --git a/boards/ugl/uhk-80-right/Kconfig.uhk-80-right b/boards/ugl/uhk-80/Kconfig.uhk-80-right similarity index 100% rename from boards/ugl/uhk-80-right/Kconfig.uhk-80-right rename to boards/ugl/uhk-80/Kconfig.uhk-80-right diff --git a/boards/ugl/uhk-dongle/Kconfig.uhk-dongle b/boards/ugl/uhk-80/Kconfig.uhk-dongle similarity index 100% rename from boards/ugl/uhk-dongle/Kconfig.uhk-dongle rename to boards/ugl/uhk-80/Kconfig.uhk-dongle diff --git a/boards/ugl/uhk-80-left/board.cmake b/boards/ugl/uhk-80/board.cmake similarity index 100% rename from boards/ugl/uhk-80-left/board.cmake rename to boards/ugl/uhk-80/board.cmake diff --git a/boards/ugl/uhk-80/board.yml b/boards/ugl/uhk-80/board.yml new file mode 100644 index 000000000..d9adb6a70 --- /dev/null +++ b/boards/ugl/uhk-80/board.yml @@ -0,0 +1,13 @@ +boards: + - name: uhk-80-left + vendor: ugl + socs: + - name: nrf52840 + - name: uhk-80-right + vendor: ugl + socs: + - name: nrf52840 + - name: uhk-dongle + vendor: ugl + socs: + - name: nrf52840 diff --git a/boards/ugl/uhk-80-left/pre_dt_board.cmake b/boards/ugl/uhk-80/pre_dt_board.cmake similarity index 100% rename from boards/ugl/uhk-80-left/pre_dt_board.cmake rename to boards/ugl/uhk-80/pre_dt_board.cmake diff --git a/boards/ugl/shared.dtsi b/boards/ugl/uhk-80/shared.dtsi similarity index 100% rename from boards/ugl/shared.dtsi rename to boards/ugl/uhk-80/shared.dtsi diff --git a/boards/ugl/uhk-80-left/uhk-80-left.dts b/boards/ugl/uhk-80/uhk-80-left.dts similarity index 90% rename from boards/ugl/uhk-80-left/uhk-80-left.dts rename to boards/ugl/uhk-80/uhk-80-left.dts index 0d0d4ab0c..521717940 100644 --- a/boards/ugl/uhk-80-left/uhk-80-left.dts +++ b/boards/ugl/uhk-80/uhk-80-left.dts @@ -1,6 +1,6 @@ /dts-v1/; #include -#include "../shared.dtsi" +#include "shared.dtsi" &gpio1 { status = "okay"; @@ -53,7 +53,7 @@ uart0_sleep: uart0_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -71,7 +71,7 @@ uart1_sleep: uart1_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -93,18 +93,18 @@ i2c2_default: i2c2_default { group1 { - psels = , - ; - bias-pull-up; + psels = , + ; + bias-pull-up; }; - }; - i2c2_sleep: i2c2_sleep { + }; + i2c2_sleep: i2c2_sleep { group1 { - psels = , - ; - low-power-enable; + psels = , + ; + low-power-enable; }; - }; + }; }; &spi1 { @@ -171,8 +171,8 @@ }; col1: col1 { - gpios = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; - label = "col1"; + gpios = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; + label = "col1"; }; col2: col2 { gpios = <&gpio0 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; diff --git a/boards/ugl/uhk-80-left/uhk-80-left.yaml b/boards/ugl/uhk-80/uhk-80-left.yaml similarity index 100% rename from boards/ugl/uhk-80-left/uhk-80-left.yaml rename to boards/ugl/uhk-80/uhk-80-left.yaml diff --git a/boards/ugl/uhk-80-left/uhk-80-left_defconfig b/boards/ugl/uhk-80/uhk-80-left_defconfig similarity index 100% rename from boards/ugl/uhk-80-left/uhk-80-left_defconfig rename to boards/ugl/uhk-80/uhk-80-left_defconfig diff --git a/boards/ugl/uhk-80-right/uhk-80-right.dts b/boards/ugl/uhk-80/uhk-80-right.dts similarity index 93% rename from boards/ugl/uhk-80-right/uhk-80-right.dts rename to boards/ugl/uhk-80/uhk-80-right.dts index 2b871039d..245c1727a 100644 --- a/boards/ugl/uhk-80-right/uhk-80-right.dts +++ b/boards/ugl/uhk-80/uhk-80-right.dts @@ -1,6 +1,6 @@ /dts-v1/; #include -#include "../shared.dtsi" +#include "shared.dtsi" &gpio1 { status = "okay"; @@ -53,7 +53,7 @@ uart0_sleep: uart0_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -71,7 +71,7 @@ uart1_sleep: uart1_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -92,16 +92,16 @@ }; i2c2_default: i2c2_default { group1 { - psels = , - ; - bias-pull-up; + psels = , + ; + bias-pull-up; }; - }; - i2c2_sleep: i2c2_sleep { + }; + i2c2_sleep: i2c2_sleep { group1 { - psels = , - ; - low-power-enable; + psels = , + ; + low-power-enable; }; }; }; diff --git a/boards/ugl/uhk-80-right/uhk-80-right.yaml b/boards/ugl/uhk-80/uhk-80-right.yaml similarity index 100% rename from boards/ugl/uhk-80-right/uhk-80-right.yaml rename to boards/ugl/uhk-80/uhk-80-right.yaml diff --git a/boards/ugl/uhk-80-right/uhk-80-right_defconfig b/boards/ugl/uhk-80/uhk-80-right_defconfig similarity index 100% rename from boards/ugl/uhk-80-right/uhk-80-right_defconfig rename to boards/ugl/uhk-80/uhk-80-right_defconfig diff --git a/boards/ugl/uhk-dongle/uhk-dongle.dts b/boards/ugl/uhk-80/uhk-dongle.dts similarity index 88% rename from boards/ugl/uhk-dongle/uhk-dongle.dts rename to boards/ugl/uhk-80/uhk-dongle.dts index 9a0da29e3..8d5792d54 100644 --- a/boards/ugl/uhk-dongle/uhk-dongle.dts +++ b/boards/ugl/uhk-80/uhk-dongle.dts @@ -1,6 +1,6 @@ /dts-v1/; #include -#include "../shared.dtsi" +#include "shared.dtsi" &pwm0 { status = "okay"; @@ -23,7 +23,7 @@ uart0_sleep: uart0_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -31,8 +31,8 @@ pwm0_default: pwm0_default { group1 { psels = , - , - ; + , + ; nordic,invert; }; }; @@ -40,8 +40,8 @@ pwm0_sleep: pwm0_sleep { group1 { psels = , - , - ; + , + ; low-power-enable; }; }; diff --git a/boards/ugl/uhk-dongle/uhk-dongle.yaml b/boards/ugl/uhk-80/uhk-dongle.yaml similarity index 100% rename from boards/ugl/uhk-dongle/uhk-dongle.yaml rename to boards/ugl/uhk-80/uhk-dongle.yaml diff --git a/boards/ugl/uhk-dongle/uhk-dongle_defconfig b/boards/ugl/uhk-80/uhk-dongle_defconfig similarity index 100% rename from boards/ugl/uhk-dongle/uhk-dongle_defconfig rename to boards/ugl/uhk-80/uhk-dongle_defconfig diff --git a/boards/ugl/uhk-dongle/Kconfig.board b/boards/ugl/uhk-dongle/Kconfig.board deleted file mode 100644 index 165551096..000000000 --- a/boards/ugl/uhk-dongle/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2023 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UHK_DONGLE - bool "UHK dongle" - depends on SOC_NRF52840_QIAA diff --git a/boards/ugl/uhk-dongle/Kconfig.defconfig b/boards/ugl/uhk-dongle/Kconfig.defconfig deleted file mode 100644 index ff53103cd..000000000 --- a/boards/ugl/uhk-dongle/Kconfig.defconfig +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# used for both zephyr and mcuboot -> no custom kconfig symbols here -if BOARD_UHK_DONGLE - -if SHELL_BACKEND_RTT -config SHELL_PROMPT_RTT - default "uhk-dongle$ " -endif # SHELL_BACKEND_RTT - -if SHELL_BACKEND_SERIAL -config SHELL_PROMPT_UART - default "uhk-dongle$ " -endif # SHELL_BACKEND_SERIAL - -if BT_DIS && BT_DIS_PNP -config BT_DIS_PNP_PID - default 0x8005 -endif # BT_DIS && BT_DIS_PNP - -config USB_DEVICE_PRODUCT - default "UHK dongle" - -config USB_DEVICE_PID - default 0x0005 - -config BT_CTLR - default BT - -endif # BOARD_UHK_DONGLE diff --git a/boards/ugl/uhk-dongle/board.cmake b/boards/ugl/uhk-dongle/board.cmake deleted file mode 100644 index 5c6b5319f..000000000 --- a/boards/ugl/uhk-dongle/board.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2021 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -board_runner_args(jlink "--device=nrf52" "--speed=4000") -board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") - -set(OPENOCD_NRF5_SUBFAMILY "nrf52") - -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake) diff --git a/boards/ugl/uhk-dongle/board.yml b/boards/ugl/uhk-dongle/board.yml deleted file mode 100644 index bcb42ea4d..000000000 --- a/boards/ugl/uhk-dongle/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: uhk-dongle - vendor: ugl - socs: - - name: nrf52840 diff --git a/boards/ugl/uhk-dongle/pre_dt_board.cmake b/boards/ugl/uhk-dongle/pre_dt_board.cmake deleted file mode 100644 index 3369c21d3..000000000 --- a/boards/ugl/uhk-dongle/pre_dt_board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - power@40000000 & clock@40000000 & bprot@40000000 -# - acl@4001e000 & flash-controller@4001e000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")