Skip to content

Commit

Permalink
build system: provide netif_ethernet implicitly
Browse files Browse the repository at this point in the history
If there is an Ethernet peripheral (periph_eth feature provided), we
can conclude that an Ethernet network interface can be provided.

Co-authored-by: mguetschow <mikolai.guetschow@tu-dresden.de>
  • Loading branch information
maribu and mguetschow committed Jun 3, 2024
1 parent 9187d16 commit 47f52bd
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 7 deletions.
4 changes: 4 additions & 0 deletions Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ FEATURES_CONFLICT += periph_usbdev:tinyusb_host
FEATURES_CONFLICT_MSG += "Package tinyUSB is not yet compatible with periph_usbdev."

# Features provided implicitly
ifneq (,$(filter periph_eth,$(FEATURES_PROVIDED)))
FEATURES_PROVIDED += netif_ethernet
endif

ifneq (,$(filter netif_%,$(FEATURES_PROVIDED)))
FEATURES_PROVIDED += netif
endif
1 change: 0 additions & 1 deletion boards/nucleo-f207zg/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif_ethernet
FEATURES_PROVIDED += riotboot
FEATURES_PROVIDED += tinyusb_device

Expand Down
1 change: 0 additions & 1 deletion boards/nucleo-f429zi/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif_ethernet
FEATURES_PROVIDED += tinyusb_device

# load the common Makefile.features for Nucleo boards
Expand Down
1 change: 0 additions & 1 deletion boards/nucleo-f439zi/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif_ethernet
FEATURES_PROVIDED += tinyusb_device

# load the common Makefile.features for Nucleo boards
Expand Down
1 change: 0 additions & 1 deletion boards/nucleo-f767zi/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif_ethernet
FEATURES_PROVIDED += riotboot
FEATURES_PROVIDED += tinyusb_device

Expand Down
1 change: 0 additions & 1 deletion boards/same54-xpro/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ FEATURES_PROVIDED += periph_freqm
FEATURES_PROVIDED += periph_can

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif_ethernet
FEATURES_PROVIDED += riotboot
FEATURES_PROVIDED += tinyusb_device
1 change: 0 additions & 1 deletion boards/stm32f746g-disco/features-shared.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ FEATURES_PROVIDED += periph_usbdev_hs
FEATURES_PROVIDED += periph_usbdev_hs_ulpi

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif_ethernet
FEATURES_PROVIDED += tinyusb_device
2 changes: 1 addition & 1 deletion dist/tools/buildsystem_sanity_check/check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ check_not_parsing_features() {
# These two files contain sanity checks using FEATURES_ so are allowed
pathspec+=(':!Makefile.include' ':!makefiles/info-global.inc.mk')

# We extend features provided in Makefile.features based on what is
# We extend FEATURES_PROVIDED in Makefile.features based on what is
# already provided to avoid clutter in each boards Makefile.features.
# E.g. `periph_eth` will pull in `netif_ethernet`, which
# will pull in `netif`.
Expand Down

0 comments on commit 47f52bd

Please sign in to comment.