Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boards: model nrf52 boards #17299

Merged
merged 11 commits into from
Dec 8, 2021
4 changes: 3 additions & 1 deletion boards/acd52832/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ config BOARD_ACD52832
select HAS_PERIPH_SPI
select HAS_PERIPH_UART

source "$(RIOTBOARD)/common/nrf52/Kconfig"
select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/nrf52xxxdk/Kconfig"
7 changes: 7 additions & 0 deletions boards/adafruit-clue/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,11 @@ config BOARD_ADAFRUIT_CLUE
select HAS_PERIPH_USBDEV
select HAS_HIGHLEVEL_STDIO

select HAVE_APDS9960
select HAVE_BMP280_I2C
select HAVE_ILI9341
select HAVE_LIS3MDL
select HAVE_SAUL_GPIO
select HAVE_SHT3X

source "$(RIOTBOARD)/common/nrf52/Kconfig"
6 changes: 6 additions & 0 deletions boards/adafruit-clue/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any)
FEATURES_PROVIDED += highlevel_stdio

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTBOARD)/common/nrf52/nrf52_bootloader.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
2 changes: 2 additions & 0 deletions boards/adafruit-itsybitsy-nrf52/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ config BOARD_ADAFRUIT_ITSYBITSY_NRF52
select HAS_PERIPH_USBDEV
select HAS_HIGHLEVEL_STDIO

select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/nrf52/Kconfig"
6 changes: 6 additions & 0 deletions boards/adafruit-itsybitsy-nrf52/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any)
FEATURES_PROVIDED += highlevel_stdio

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTBOARD)/common/nrf52/nrf52_bootloader.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-nano-33-ble/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ config BOARD_ARDUINO_NANO_33_BLE
select HAS_PERIPH_USBDEV
select HAS_HIGHLEVEL_STDIO

select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/nrf52/Kconfig"
6 changes: 6 additions & 0 deletions boards/arduino-nano-33-ble/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any)
FEATURES_PROVIDED += highlevel_stdio

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTBOARD)/common/nrf52/nrf52_bootloader.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
24 changes: 24 additions & 0 deletions boards/common/e104-bt50xxa-tb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,28 @@ config BOARD_COMMON_E104_BT50XXA_TB
select HAS_PERIPH_SPI
select HAS_PERIPH_UART

select HAVE_SAUL_GPIO
select MODULE_BOARDS_COMMON_E104_BT50XXA_TB if TEST_KCONFIG

config MODULE_BOARDS_COMMON_E104_BT50XXA_TB
bool
depends on TEST_KCONFIG
help
common code of e104-bt50xxa-tb boards

config MODULE_BOARD_SOFTWARE_RESET
bool "Enable softare reset button"
default y
depends on HAS_PERIPH_GPIO
depends on HAS_PERIPH_GPIO_IRQ
depends on HAS_PERIPH_PM
depends on TEST_KCONFIG
select MODULE_PERIPH_GPIO
select MODULE_PERIPH_GPIO_IRQ
select MODULE_PERIPH_PM

choice NRF5X_RADIO_BACKEND
default MODULE_NRFMIN
endchoice

source "$(RIOTBOARD)/common/nrf52/Kconfig"
4 changes: 4 additions & 0 deletions boards/common/nrf52/nrf52_bootloader.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CONFIG_MODULE_USBUS=y
CONFIG_MODULE_USBUS_CDC_ACM=y
CONFIG_MODULE_STDIO_CDC_ACM=y
CONFIG_MODULE_USB_BOARD_RESET=y
6 changes: 4 additions & 2 deletions boards/common/nrf52xxxdk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ config BOARDS_COMMON_NRF52XXXDK

select HAVE_SAUL_GPIO

config MODULE_BOARDS_COMMON_NRF52XXDK
config MODULE_BOARDS_COMMON_NRF52XXXDK
bool
default y
depends on TEST_KCONFIG
help
Common code for boards based on nrf52xxxdk.

source "$(RIOTBOARD)/common/nrf52/Kconfig"
2 changes: 1 addition & 1 deletion boards/common/nrf52xxxdk/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MODULE = boards_common_nrf52xxdk
MODULE = boards_common_nrf52xxxdk

include $(RIOTBASE)/Makefile.base
12 changes: 12 additions & 0 deletions boards/common/particle-mesh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,20 @@ config BOARD_COMMON_PARTICLE_MESH
select HAS_PERIPH_PWM
select HAS_PERIPH_SPI
select HAS_PERIPH_UART
select HAS_PERIPH_UART_HW_FC
select HAS_PERIPH_USBDEV
select HAS_HIGHLEVEL_STDIO
select HAS_VDD_LC_FILTER_REG1

select HAVE_SAUL_GPIO
select HAVE_SAUL_PWM

select MODULE_BOARDS_COMMON_PARTICLE_MESH if TEST_KCONFIG

config MODULE_BOARDS_COMMON_PARTICLE_MESH
bool
depends on TEST_KCONFIG
help
Common code for particle-mesh boards

source "$(RIOTBOARD)/common/nrf52/Kconfig"
3 changes: 1 addition & 2 deletions boards/common/particle-mesh/Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ ifeq (1,$(PARTICLE_MONOFIRMWARE))
USEMODULE += usb_board_reset
endif

include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk

include $(RIOTBOARD)/common/nrf52/bootloader_nrfutil.dep.mk
# include common nrf52 dependencies
include $(RIOTBOARD)/common/nrf52/Makefile.dep
8 changes: 7 additions & 1 deletion boards/common/particle-mesh/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_uart_hw_fc
FEATURES_PROVIDED += periph_usbdev
FEATURES_PROVIDED += vdd_lc_filter_reg1

# Various other features (if any)

FEATURES_PROVIDED += highlevel_stdio

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTBOARD)/common/nrf52/nrf52_bootloader.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
3 changes: 2 additions & 1 deletion boards/dwm1001/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ config BOARD_DWM1001
select HAS_PERIPH_SPI
select HAS_PERIPH_UART
select HAS_VDD_LC_FILTER_REG1
select HAVE_LIS2DH12

select HAVE_LIS2DH12_SPI

source "$(RIOTBOARD)/common/nrf52/Kconfig"
2 changes: 1 addition & 1 deletion boards/dwm1001/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += lis2dh12
USEMODULE += lis2dh12_spi
endif

# include common nrf52 dependencies
Expand Down
2 changes: 2 additions & 0 deletions boards/feather-nrf52840/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ config BOARD_FEATHER_NRF52840
select HAS_PERIPH_USBDEV
select HAS_HIGHLEVEL_STDIO

select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/nrf52/Kconfig"
6 changes: 6 additions & 0 deletions boards/feather-nrf52840/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any)
FEATURES_PROVIDED += highlevel_stdio

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTBOARD)/common/nrf52/nrf52_bootloader.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
2 changes: 2 additions & 0 deletions boards/microbit-v2/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ config BOARD_MICROBIT_V2
select HAS_PERIPH_UART
select HAS_VDD_LC_FILTER_REG1

select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/microbit/Kconfig"
source "$(RIOTBOARD)/common/nrf52/Kconfig"
2 changes: 2 additions & 0 deletions boards/nrf52832-mdk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ config BOARD_NRF52832_MDK
select HAS_PERIPH_UART
select HAS_VDD_LC_FILTER_REG1

select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/nrf52/Kconfig"
3 changes: 3 additions & 0 deletions boards/nrf52840-mdk-dongle/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ config BOARD_NRF52840_MDK_DONGLE
select HAS_PERIPH_USBDEV
select HAS_HIGHLEVEL_STDIO

select HAVE_SAUL_GPIO
select HAVE_SAUL_PWM

source "$(RIOTBOARD)/common/nrf52/Kconfig"
6 changes: 6 additions & 0 deletions boards/nrf52840-mdk-dongle/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,10 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any)
FEATURES_PROVIDED += highlevel_stdio

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTBOARD)/common/nrf52/nrf52_bootloader.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
2 changes: 2 additions & 0 deletions boards/nrf52840-mdk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ config BOARD_NRF52840_MDK
select HAS_PERIPH_USBDEV
select HAS_VDD_LC_FILTER_REG1

select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/nrf52/Kconfig"
2 changes: 2 additions & 0 deletions boards/nrf52840dk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ config BOARD_NRF52840DK
select HAS_VDD_LC_FILTER_REG0
select HAVE_MTD_SPI_NOR

select MODULE_BOARDS_COMMON_NRF52XXXDK if TEST_KCONFIG

source "$(RIOTBOARD)/common/nrf52xxxdk/Kconfig"
2 changes: 1 addition & 1 deletion boards/nrf52840dk/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
USEMODULE += boards_common_nrf52xxdk
USEMODULE += boards_common_nrf52xxxdk

ifneq (,$(filter mtd,$(USEMODULE)))
USEMODULE += mtd_spi_nor
Expand Down
4 changes: 4 additions & 0 deletions boards/nrf52840dongle/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ config BOARD_NRF52840DONGLE
select HAS_VDD_LC_FILTER_REG0
select HAS_VDD_LC_FILTER_REG1

select HAVE_SAUL_GPIO
select HAVE_SAUL_PWM
select HAVE_SAUL_NRF_VDDH

source "$(RIOTBOARD)/common/nrf52/Kconfig"
6 changes: 6 additions & 0 deletions boards/nrf52840dongle/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,10 @@ FEATURES_PROVIDED += vdd_lc_filter_reg1
# Various other features (if any)
FEATURES_PROVIDED += highlevel_stdio

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTBOARD)/common/nrf52/nrf52_bootloader.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
2 changes: 2 additions & 0 deletions boards/nrf52dk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ config BOARD_NRF52DK
select BOARDS_COMMON_NRF52XXXDK
select CPU_MODEL_NRF52832XXAA

select MODULE_BOARDS_COMMON_NRF52XXXDK if TEST_KCONFIG

source "$(RIOTBOARD)/common/nrf52xxxdk/Kconfig"
2 changes: 1 addition & 1 deletion boards/nrf52dk/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
USEMODULE += boards_common_nrf52xxdk
USEMODULE += boards_common_nrf52xxxdk

include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep
1 change: 1 addition & 0 deletions boards/particle-argon/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ config BOARD_PARTICLE_ARGON
bool
default y
select BOARD_COMMON_PARTICLE_MESH
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART

source "$(RIOTBOARD)/common/particle-mesh/Kconfig"
4 changes: 3 additions & 1 deletion boards/particle-argon/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
USEMODULE += boards_common_particle_mesh
USEMODULE += periph_uart_hw_fc
ifneq (,$(filter periph_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart_hw_fc
endif

include $(RIOTBOARD)/common/particle-mesh/Makefile.dep
1 change: 1 addition & 0 deletions boards/particle-boron/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ config BOARD_PARTICLE_BORON
bool
default y
select BOARD_COMMON_PARTICLE_MESH
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART

source "$(RIOTBOARD)/common/particle-mesh/Kconfig"
4 changes: 3 additions & 1 deletion boards/particle-boron/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
USEMODULE += boards_common_particle_mesh
USEMODULE += periph_uart_hw_fc
ifneq (,$(filter periph_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart_hw_fc
endif

include $(RIOTBOARD)/common/particle-mesh/Makefile.dep
3 changes: 3 additions & 0 deletions boards/pinetime/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ config BOARD_PINETIME
select HAS_PERIPH_SPI
select HAS_VDD_LC_FILTER_REG1

select HAVE_ILI9341
select HAVE_MTD_SPI_NOR

source "$(RIOTBOARD)/common/nrf52/Kconfig"
6 changes: 6 additions & 0 deletions boards/pinetime/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ FEATURES_PROVIDED += periph_spi
#FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += vdd_lc_filter_reg1

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1, $(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(BOARDDIR)/pinetime.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
1 change: 1 addition & 0 deletions boards/pinetime/pinetime.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_MODULE_STDIO_RTT=y
3 changes: 3 additions & 0 deletions boards/reel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ config BOARD_REEL
select HAS_PERIPH_USBDEV
select HAS_VDD_LC_FILTER_REG1

select HAVE_MMA8X5X
select HAVE_SAUL_GPIO

source "$(RIOTBOARD)/common/nrf52/Kconfig"
8 changes: 7 additions & 1 deletion boards/ruuvitag/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@ config BOARD_RUUVITAG
select HAS_PERIPH_UART
select HAS_VDD_LC_FILTER_REG1

source "$(RIOTBOARD)/common/nrf52/Kconfig"
select HAVE_SAUL_GPIO
select HAVE_BME280_SPI
select HAVE_LIS2DH12_SPI

select MODULE_BOARDS_COMMON_NRF52XXXDK if TEST_KCONFIG

source "$(RIOTBOARD)/common/nrf52xxxdk/Kconfig"
2 changes: 1 addition & 1 deletion boards/ruuvitag/Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
USEMODULE += stdio_rtt
endif

USEMODULE += boards_common_nrf52xxdk
USEMODULE += boards_common_nrf52xxxdk

include $(RIOTBOARD)/common/nrf52/Makefile.dep
6 changes: 6 additions & 0 deletions boards/ruuvitag/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@ FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += vdd_lc_filter_reg1

# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1,$(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(BOARDDIR)/ruuvitag.config
endif

include $(RIOTBOARD)/common/nrf52/Makefile.features
1 change: 1 addition & 0 deletions boards/ruuvitag/ruuvitag.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_MODULE_STDIO_RTT=y
4 changes: 4 additions & 0 deletions boards/thingy52/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@ config BOARD_THINGY52
select HAS_PERIPH_UART
select HAS_VDD_LC_FILTER_REG1

select HAVE_LPS22HB
select HAVE_LIS2DH12_I2C
select HAVE_HTS221

source "$(RIOTBOARD)/common/nrf52/Kconfig"
2 changes: 1 addition & 1 deletion boards/thingy52/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += lis2dh12
USEMODULE += lis2dh12_i2c
USEMODULE += hts221
USEMODULE += lps22hb
endif
Expand Down
Loading