diff --git a/boards/vendor/custom_plank/Kconfig b/boards/bh/mellifera_rev1/Kconfig similarity index 66% rename from boards/vendor/custom_plank/Kconfig rename to boards/bh/mellifera_rev1/Kconfig index 8cd0b55..fce8401 100644 --- a/boards/vendor/custom_plank/Kconfig +++ b/boards/bh/mellifera_rev1/Kconfig @@ -1,8 +1,12 @@ # Copyright (c) 2021 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 +if BOARD_MELLIFERA_REV1 + config BOARD_ENABLE_DCDC bool "Enable DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_CUSTOM_PLANK + depends on BOARD_MELLIFERA_REV1 + +endif # BOARD_MELLIFERA_REV1 \ No newline at end of file diff --git a/boards/vendor/custom_plank/Kconfig.custom_plank b/boards/bh/mellifera_rev1/Kconfig.mellifera_rev1 similarity index 61% rename from boards/vendor/custom_plank/Kconfig.custom_plank rename to boards/bh/mellifera_rev1/Kconfig.mellifera_rev1 index 08c6e07..23be9dc 100644 --- a/boards/vendor/custom_plank/Kconfig.custom_plank +++ b/boards/bh/mellifera_rev1/Kconfig.mellifera_rev1 @@ -1,5 +1,5 @@ # Copyright (c) 2021 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -config BOARD_CUSTOM_PLANK - select SOC_NRF52840_QIAA +config BOARD_MELLIFERA_REV1 + select SOC_NRF52832_QFAA diff --git a/boards/vendor/custom_plank/README.md b/boards/bh/mellifera_rev1/README.md similarity index 100% rename from boards/vendor/custom_plank/README.md rename to boards/bh/mellifera_rev1/README.md diff --git a/boards/vendor/custom_plank/board.cmake b/boards/bh/mellifera_rev1/board.cmake similarity index 86% rename from boards/vendor/custom_plank/board.cmake rename to boards/bh/mellifera_rev1/board.cmake index 5c6b531..5f201cc 100644 --- a/boards/vendor/custom_plank/board.cmake +++ b/boards/bh/mellifera_rev1/board.cmake @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=nrf52" "--speed=4000") -board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000") +board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000") set(OPENOCD_NRF5_SUBFAMILY "nrf52") diff --git a/boards/vendor/custom_plank/board.yml b/boards/bh/mellifera_rev1/board.yml similarity index 62% rename from boards/vendor/custom_plank/board.yml rename to boards/bh/mellifera_rev1/board.yml index fde81e2..16fb145 100644 --- a/boards/vendor/custom_plank/board.yml +++ b/boards/bh/mellifera_rev1/board.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 board: - name: custom_plank - vendor: vendor + name: mellifera_rev1 + vendor: bh socs: - - name: nrf52840 + - name: nrf52832 diff --git a/boards/bh/mellifera_rev1/mellifera_rev1-pinctrl.dtsi b/boards/bh/mellifera_rev1/mellifera_rev1-pinctrl.dtsi new file mode 100644 index 0000000..460e887 --- /dev/null +++ b/boards/bh/mellifera_rev1/mellifera_rev1-pinctrl.dtsi @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2022 Nordic Semiconductor ASA + * SPDX-License-Identifier: Apache-2.0 + */ + +&pinctrl { + // uart0_default: uart0_default { + // group1 { + // psels = , + // , + // , + // ; + // }; + // }; + + // uart0_sleep: uart0_sleep { + // group1 { + // psels = , + // , + // , + // ; + // low-power-enable; + // }; + // }; + + + uart0_default: uart0_default { + group1 { + psels = , + ; + }; + }; + + uart0_sleep: uart0_sleep { + group1 { + psels = , + ; + low-power-enable; + }; + }; + + +}; diff --git a/boards/vendor/custom_plank/custom_plank.dts b/boards/bh/mellifera_rev1/mellifera_rev1.dts similarity index 72% rename from boards/vendor/custom_plank/custom_plank.dts rename to boards/bh/mellifera_rev1/mellifera_rev1.dts index d5143a8..e894e23 100644 --- a/boards/vendor/custom_plank/custom_plank.dts +++ b/boards/bh/mellifera_rev1/mellifera_rev1.dts @@ -4,12 +4,12 @@ */ /dts-v1/; -#include -#include "custom_plank-pinctrl.dtsi" +#include +#include "mellifera_rev1-pinctrl.dtsi" / { - model = "Custom Plank Board"; - compatible = "vendor,custom-plank"; + model = "Mellifera rev1"; + compatible = "bh,mellifera_rev1"; chosen { zephyr,console = &uart0; @@ -19,12 +19,12 @@ example_sensor: example-sensor { compatible = "zephyr,example-sensor"; - input-gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + input-gpios = <&gpio0 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; }; blink_led: blink-led { compatible = "blink-gpio-led"; - led-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + led-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; blink-period-ms = <1000>; }; }; diff --git a/boards/bh/mellifera_rev1/mellifera_rev1.yaml b/boards/bh/mellifera_rev1/mellifera_rev1.yaml new file mode 100644 index 0000000..638ae00 --- /dev/null +++ b/boards/bh/mellifera_rev1/mellifera_rev1.yaml @@ -0,0 +1,40 @@ +# Copyright (c) 2021 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +identifier: mellifera_rev1 +name: Mellifera-Rev1 +# vendor: bh +# type: mcu +# arch: arm +# ram: 256 +# flash: 1024 +# toolchain: +# - zephyr +# - gnuarmemb +# - xtools +# supported: +# - gpio + +# identifier: nrf52dk/nrf52832 +# name: nRF52-DK-NRF52832 +type: mcu +arch: arm +toolchain: + - zephyr + - gnuarmemb + - xtools +ram: 64 +flash: 512 +supported: + - adc + - arduino_gpio + - arduino_i2c + - arduino_spi + - gpio + - counter + - nvs + - i2c + - pwm + - spi + - watchdog +vendor: nordic diff --git a/boards/vendor/custom_plank/custom_plank_defconfig b/boards/bh/mellifera_rev1/mellifera_rev1_defconfig similarity index 100% rename from boards/vendor/custom_plank/custom_plank_defconfig rename to boards/bh/mellifera_rev1/mellifera_rev1_defconfig diff --git a/boards/vendor/custom_plank/custom_plank-pinctrl.dtsi b/boards/vendor/custom_plank/custom_plank-pinctrl.dtsi deleted file mode 100644 index 4da31cb..0000000 --- a/boards/vendor/custom_plank/custom_plank-pinctrl.dtsi +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * SPDX-License-Identifier: Apache-2.0 - */ - -&pinctrl { - uart0_default: uart0_default { - group1 { - psels = , - , - , - ; - }; - }; - - uart0_sleep: uart0_sleep { - group1 { - psels = , - , - , - ; - low-power-enable; - }; - }; - -}; diff --git a/boards/vendor/custom_plank/custom_plank.yaml b/boards/vendor/custom_plank/custom_plank.yaml deleted file mode 100644 index 1a057e0..0000000 --- a/boards/vendor/custom_plank/custom_plank.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2021 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -identifier: custom_plank -name: Custom-Plank -vendor: vendor -type: mcu -arch: arm -ram: 256 -flash: 1024 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - gpio