kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-28 16:01:18 +01:00
Code Releases Activity

Merge pull request #11792 from aabadie/pr/boards/nrf52_dep

Browse Source 
boards/nrf52: introduce shared dependencies in common/nrf52 and update boards
This commit is contained in:
Hauke Petersen 2019-10-02 14:04:07 +02:00 committed by GitHub
commit 85ca598c7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/acd52832/Makefile.features
View File

@ -5,5 +5,4 @@ FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_uart
include $(RIOTBOARD)/common/nrf52/Makefile.nrf52832.features
include $(RIOTBOARD)/common/nrf52/Makefile.features

10
boards/common/nrf52/Makefile.dep
View File

@ -2,8 +2,10 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_nrf_temperature
endif
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
ifeq (,$(filter nordic_softdevice_ble nrfmin nrf802154,$(USEMODULE) $(USEPKG)))
USEMODULE += nimble_netif
endif
ifneq (,$(findstring nrf52832, $(CPU_MODEL)))
# include common nrf52832 dependencies
include $(RIOTBOARD)/common/nrf52/nrf52832/Makefile.dep
else ifneq (,$(findstring nrf52840, $(CPU_MODEL)))
# include common nrf52840 dependencies
include $(RIOTBOARD)/common/nrf52/nrf52840/Makefile.dep
endif

5
boards/common/nrf52/Makefile.features
View File

@ -9,3 +9,8 @@ endif
# Various other features (if any)
FEATURES_PROVIDED += ble_nimble
ifneq (,$(findstring nrf52832, $(CPU_MODEL)))
# Nordic SoftDevice support in RIOT is verified for all nrf52832-based boards
FEATURES_PROVIDED += ble_nordic_softdevice
endif

2
boards/common/nrf52/Makefile.nrf52832.features
View File

@ -1,2 +0,0 @@
# Nordic SoftDevice support in RIOT is verified for all nrf52832-based boards
FEATURES_PROVIDED += ble_nordic_softdevice

5
boards/common/nrf52/nrf52832/Makefile.dep Normal file
View File

@ -0,0 +1,5 @@
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
ifeq (,$(filter nordic_softdevice_ble nrfmin,$(USEMODULE) $(USEPKG)))
USEMODULE += nimble_netif
endif
endif

5
boards/common/nrf52/nrf52840/Makefile.dep Normal file
View File

@ -0,0 +1,5 @@
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
ifeq (,$(filter nimble_netif nrfmin,$(USEMODULE)))
USEMODULE += nrf802154
endif
endif

7
boards/common/particle-mesh/Makefile.dep
View File

@ -2,10 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
ifeq (,$(filter nrfmin,$(USEMODULE)))
USEMODULE += nrf802154
endif
endif
# include common nrf52 dependencies
include $(RIOTBOARD)/common/nrf52/Makefile.dep

1
boards/nrf52832-mdk/Makefile.dep
View File

@ -2,4 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif
# include common nrf52 dependencies
include $(RIOTBOARD)/common/nrf52/Makefile.dep

1
boards/nrf52832-mdk/Makefile.features
View File

@ -4,5 +4,4 @@ CPU_MODEL = nrf52832xxaa
FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_uart
include $(RIOTBOARD)/common/nrf52/Makefile.nrf52832.features
include $(RIOTBOARD)/common/nrf52/Makefile.features

7
boards/nrf52840-mdk/Makefile.dep
View File

@ -2,10 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
ifeq (,$(filter nrfmin,$(USEMODULE)))
USEMODULE += nrf802154
endif
endif
# include common nrf52 dependencies
include $(RIOTBOARD)/common/nrf52/Makefile.dep

6
boards/nrf52840dk/Makefile.dep
View File

@ -1,7 +1 @@
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
ifeq (,$(filter nrfmin,$(USEMODULE)))
USEMODULE += nrf802154
endif
endif
include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep

1
boards/nrf52dk/Makefile.features
View File

@ -1,4 +1,3 @@
CPU_MODEL = nrf52832xxaa
include $(RIOTBOARD)/common/nrf52/Makefile.nrf52832.features
include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features

6
boards/reel/Makefile.dep
View File

@ -3,10 +3,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += mma8x5x
endif
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
ifeq (,$(filter nrfmin,$(USEMODULE)))
USEMODULE += nrf802154
endif
endif
include $(RIOTBOARD)/common/nrf52/Makefile.dep

4
boards/ruuvitag/Makefile.dep
View File

@ -5,8 +5,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
# USEMODULE += bme280_spi
endif
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
USEMODULE += nrfmin
endif
include $(RIOTBOARD)/common/nrf52/Makefile.dep

1
boards/ruuvitag/Makefile.features
View File

@ -4,5 +4,4 @@ CPU_MODEL = nrf52832xxaa
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_uart
include $(RIOTBOARD)/common/nrf52/Makefile.nrf52832.features
include $(RIOTBOARD)/common/nrf52/Makefile.features

4
boards/thingy52/Makefile.dep
View File

@ -1,7 +1,3 @@
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
USEMODULE += nrfmin
endif
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += lis2dh12
endif

1
boards/thingy52/Makefile.features
View File

@ -4,5 +4,4 @@ CPU_MODEL = nrf52832xxaa
FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_uart
include $(RIOTBOARD)/common/nrf52/Makefile.nrf52832.features
include $(RIOTBOARD)/common/nrf52/Makefile.features