diff --git a/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig b/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig new file mode 100644 index 0000000..dce0746 --- /dev/null +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig @@ -0,0 +1,9 @@ + +if BOARD_BPARASITE_NRF52840 + +config BOARD_ENABLE_DCDC + bool "DCDC mode" + select SOC_DCDC_NRF52X + default y + +endif # BOARD_BPARASITE_NRF52840 \ No newline at end of file diff --git a/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig.board b/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig.board new file mode 100644 index 0000000..a72a7a2 --- /dev/null +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig.board @@ -0,0 +1,4 @@ + +config BOARD_BPARASITE_NRF52840 + bool "b-parasite nRF52840 board" + depends on SOC_NRF52840_QIAA \ No newline at end of file diff --git a/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig.defconfig b/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig.defconfig new file mode 100644 index 0000000..dcbc09a --- /dev/null +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/Kconfig.defconfig @@ -0,0 +1,10 @@ + +if BOARD_BPARASITE_NRF52840 + +config BOARD + default "bparasite_nrf52840" + +config BT_CTLR + default BT + +endif # BOARD_BPARASITE_NRF52840 \ No newline at end of file diff --git a/code/nrf-connect/boards/arm/bparasite_nrf52840/board.cmake b/code/nrf-connect/boards/arm/bparasite_nrf52840/board.cmake new file mode 100644 index 0000000..b3d4f0d --- /dev/null +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/board.cmake @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: Apache-2.0 + +board_runner_args(jlink "--device=nRF52840_xxAA" "--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/code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi b/code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi new file mode 100644 index 0000000..7f7462e --- /dev/null +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi @@ -0,0 +1,48 @@ + +&pinctrl { + uart0_default: uart0_default { + group1 { + psels = , + ; + }; + }; + + uart0_sleep: uart0_sleep { + group1 { + psels = , + ; + low-power-enable; + }; + }; + + /* Configure pwm0 instance to use pin 5. */ + pwm0_default: pwm0_default { + group1 { + psels = ; + nordic,invert; + }; + }; + + pwm0_sleep: pwm0_sleep { + group1 { + psels = ; + low-power-enable; + }; + }; + + /* Configure i2c0 instance to use pins 24 (SDA) & 13 (SCL). */ + i2c0_default: i2c0_default { + group1 { + psels = , + ; + }; + }; + + i2c0_sleep: i2c0_sleep { + group1 { + psels = , + ; + low-power-enable; + }; + }; +}; \ No newline at end of file diff --git a/code/nrf-connect/boards/arm/parasite/parasite.dts b/code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts similarity index 77% rename from code/nrf-connect/boards/arm/parasite/parasite.dts rename to code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts index 2f555f8..c3cee1d 100644 --- a/code/nrf-connect/boards/arm/parasite/parasite.dts +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts @@ -1,37 +1,52 @@ /dts-v1/; #include +#include "bparasite_nrf52840-pinctrl.dtsi" -&pinctrl { - /* Configure pwm0 instance to use pin 5. */ - pwm0_default: pwm0_default { - group1 { - psels = ; - nordic,invert; - }; +/ { + model = "A soil moisture sensor based on Nordic's nRF52840"; + compatible = "rbaron,bparasite_nrf52840"; + + chosen { + // zephyr,console = &uart0; + // zephyr,shell-uart = &uart0; + // zephyr,uart-mcumgr = &uart0; + // zephyr,bt-mon-uart = &uart0; + // zephyr,bt-c2h-uart = &uart0; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + zephyr,code-partition = &slot0_partition; }; - pwm0_sleep: pwm0_sleep { - group1 { - psels = ; - low-power-enable; - }; + zephyr,user { + io-channels = <&adc 0>, <&adc 1>, <&adc 2>; }; - /* Configure i2c0 instance to use pins 24 (SDA) & 13 (SCL). */ - i2c0_default: i2c0_default { - group1 { - psels = , - ; - }; + soil_pwm: soil_pwm { + compatible = "pwm-fixed"; + pwms = <&pwm0 0 PWM_MSEC(100) PWM_POLARITY_INVERTED>; + pulse = ; }; +}; - i2c0_sleep: i2c0_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; +&gpiote { + status = "okay"; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&uart0 { + compatible = "nordic,nrf-uart"; + status = "okay"; + current-speed = <115200>; + pinctrl-0 = <&uart0_default>; + pinctrl-1 = <&uart0_sleep>; + pinctrl-names = "default", "sleep"; }; &i2c0 { @@ -130,22 +145,3 @@ }; }; }; - -/ { - - model = "A soil moisture sensor"; - compatible = "rbaron,b-parasite"; - - zephyr,user { - io-channels = <&adc 0>, <&adc 1>, <&adc 2>; - zephyr,sram = &sram0; - zephyr,flash = &flash0; - zephyr,code-partition = &slot0_partition; - }; - - soil_pwm: soil_pwm { - compatible = "pwm-fixed"; - pwms = <&pwm0 0 PWM_MSEC(100) PWM_POLARITY_INVERTED>; - pulse = ; - }; -}; \ No newline at end of file diff --git a/code/nrf-connect/boards/arm/parasite/parasite_defconfig b/code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig similarity index 68% rename from code/nrf-connect/boards/arm/parasite/parasite_defconfig rename to code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig index 4f5d366..1c5a793 100644 --- a/code/nrf-connect/boards/arm/parasite/parasite_defconfig +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig @@ -2,26 +2,26 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y -# CONFIG_BOARD_NRF52840DK_NRF52840=y +CONFIG_BOARD_BPARASITE_NRF52840=y # # Enable MPU CONFIG_ARM_MPU=y # # Enable hardware stack protection -CONFIG_HW_STACK_PROTECTION=y +# CONFIG_HW_STACK_PROTECTION=y # # Enable RTT -CONFIG_USE_SEGGER_RTT=y +# CONFIG_USE_SEGGER_RTT=y # # enable GPIO CONFIG_GPIO=y # # enable uart driver -CONFIG_SERIAL=y +# CONFIG_SERIAL=y # # enable console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y +# CONFIG_CONSOLE=y +# CONFIG_UART_CONSOLE=y # # additional board options CONFIG_GPIO_AS_PINRESET=y diff --git a/code/nrf-connect/boards/arm/bparasite_nrf52840/pre_dt_board.cmake b/code/nrf-connect/boards/arm/bparasite_nrf52840/pre_dt_board.cmake new file mode 100644 index 0000000..3369c21 --- /dev/null +++ b/code/nrf-connect/boards/arm/bparasite_nrf52840/pre_dt_board.cmake @@ -0,0 +1,7 @@ +# 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/code/nrf-connect/boards/arm/parasite/Kconfig.board b/code/nrf-connect/boards/arm/parasite/Kconfig.board deleted file mode 100644 index afa3bff..0000000 --- a/code/nrf-connect/boards/arm/parasite/Kconfig.board +++ /dev/null @@ -1,4 +0,0 @@ - -config BOARD_B_PARASITE - bool "b-parasite board" - depends on SOC_NRF52840_QIAA \ No newline at end of file diff --git a/code/nrf-connect/boards/arm/parasite/Kconfig.defconfig b/code/nrf-connect/boards/arm/parasite/Kconfig.defconfig deleted file mode 100644 index b06f3ed..0000000 --- a/code/nrf-connect/boards/arm/parasite/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ - -if BOARD_PARASITE - -config BOARD - default "parasite" - -endif # BOARD_PARASITE \ No newline at end of file