riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/nrf52: provide radio_nrf802154 at CPU level

Browse Source 
The presence of the 802.15.4 radio peripheral is a feature of the CPU,
not the board.
Move it to the right place and reduce code duplication.
This commit is contained in:
Benjamin Valentin 2020-10-02 10:44:59 +02:00
parent 82ab75c2b4
commit c78ee2bf64
20 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/adafruit-clue/Kconfig
View File

@ -16,7 +16,6 @@ config BOARD_ADAFRUIT_CLUE
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
select HAS_BOOTLOADER_NRFUTIL select HAS_BOOTLOADER_NRFUTIL
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

1
boards/adafruit-clue/Makefile.features
View File

@ -7,7 +7,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
FEATURES_PROVIDED += bootloader_nrfutil FEATURES_PROVIDED += bootloader_nrfutil
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

1
boards/adafruit-itsybitsy-nrf52/Kconfig
View File

@ -16,7 +16,6 @@ config BOARD_ADAFRUIT_ITSYBITSY_NRF52
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
select HAS_BOOTLOADER_NRFUTIL select HAS_BOOTLOADER_NRFUTIL
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

1
boards/adafruit-itsybitsy-nrf52/Makefile.features
View File

@ -7,7 +7,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
FEATURES_PROVIDED += bootloader_nrfutil FEATURES_PROVIDED += bootloader_nrfutil
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

1
boards/arduino-nano-33-ble/Kconfig
View File

@ -16,7 +16,6 @@ config BOARD_ARDUINO_NANO_33_BLE
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
select HAS_BOOTLOADER_ARDUINO select HAS_BOOTLOADER_ARDUINO
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

1
boards/arduino-nano-33-ble/Makefile.features
View File

@ -7,7 +7,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
FEATURES_PROVIDED += bootloader_arduino FEATURES_PROVIDED += bootloader_arduino
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

1
boards/common/particle-mesh/Kconfig
View File

@ -13,6 +13,5 @@ config BOARD_COMMON_PARTICLE_MESH
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

1
boards/common/particle-mesh/Makefile.features
View File

@ -8,6 +8,5 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

1
boards/feather-nrf52840/Kconfig
View File

@ -16,6 +16,5 @@ config BOARD_FEATHER_NRF52840
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

1
boards/feather-nrf52840/Makefile.features
View File

@ -7,6 +7,5 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

1
boards/nrf52840-mdk/Kconfig
View File

@ -16,6 +16,5 @@ config BOARD_NRF52840_MDK
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

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

@ -7,6 +7,5 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

1
boards/nrf52840dk/Kconfig
View File

@ -12,7 +12,6 @@ config BOARD_NRF52840DK
default y default y
select BOARD_COMMON_NRF52XXXDK select BOARD_COMMON_NRF52XXXDK
select CPU_MODEL_NRF52840XXAA select CPU_MODEL_NRF52840XXAA
select HAS_RADIO_NRF802154
select HAS_PERIPH_PWM select HAS_PERIPH_PWM
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV

1
boards/nrf52840dk/Makefile.features
View File

@ -3,6 +3,5 @@ CPU_MODEL = nrf52840xxaa
include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev

1
boards/nrf52840dongle/Kconfig
View File

@ -15,7 +15,6 @@ config BOARD_NRF52840DONGLE
select HAS_PERIPH_PWM select HAS_PERIPH_PWM
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
select HAS_BOOTLOADER_NRFUTIL select HAS_BOOTLOADER_NRFUTIL
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

1
boards/nrf52840dongle/Makefile.features
View File

@ -6,7 +6,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
FEATURES_PROVIDED += bootloader_nrfutil FEATURES_PROVIDED += bootloader_nrfutil
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

1
boards/reel/Kconfig
View File

@ -16,6 +16,5 @@ config BOARD_REEL
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV select HAS_PERIPH_USBDEV
select HAS_RADIO_NRF802154
source "$(RIOTBOARD)/common/nrf52/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig"

1
boards/reel/Makefile.features
View File

@ -7,6 +7,5 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += radio_nrf802154
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

4
cpu/nrf52/Kconfig
View File

@ -30,11 +30,13 @@ config CPU_MODEL_NRF52811XXAA
bool bool
select CPU_CORE_CORTEX_M4 select CPU_CORE_CORTEX_M4
select CPU_FAM_NRF52 select CPU_FAM_NRF52
select HAS_RADIO_NRF802154
config CPU_MODEL_NRF52820XXAA config CPU_MODEL_NRF52820XXAA
bool bool
select CPU_CORE_CORTEX_M4 select CPU_CORE_CORTEX_M4
select CPU_FAM_NRF52 select CPU_FAM_NRF52
select HAS_RADIO_NRF802154
config CPU_MODEL_NRF52832XXAA config CPU_MODEL_NRF52832XXAA
bool bool
@ -46,11 +48,13 @@ config CPU_MODEL_NRF52833XXAA
bool bool
select CPU_CORE_CORTEX_M4F select CPU_CORE_CORTEX_M4F
select CPU_FAM_NRF52 select CPU_FAM_NRF52
select HAS_RADIO_NRF802154
config CPU_MODEL_NRF52840XXAA config CPU_MODEL_NRF52840XXAA
bool bool
select CPU_CORE_CORTEX_M4F select CPU_CORE_CORTEX_M4F
select CPU_FAM_NRF52 select CPU_FAM_NRF52
select HAS_RADIO_NRF802154
## CPU common symbols ## CPU common symbols
config CPU_FAM config CPU_FAM

5
cpu/nrf52/Makefile.features
View File

@ -5,6 +5,11 @@ CPU_CORE = cortex-m4
endif endif
CPU_FAM = nrf52 CPU_FAM = nrf52
# The 802.15.4 radio is not available on all SoCs
ifneq (,$(filter nrf52811xxaa nrf52820xxaa rf52833xxaa nrf52840xxaa,$(CPU_MODEL)))
FEATURES_PROVIDED += radio_nrf802154
endif
# The ADC does not depend on any board configuration, so always available # The ADC does not depend on any board configuration, so always available
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc