RIOT-OS · mguetschow · Jun 3, 2024 · May 28, 2024 · May 27, 2024 · May 27, 2024
diff --git a/Makefile.features b/Makefile.features
@@ -31,3 +31,12 @@ FEATURES_CONFLICT_MSG += "Only one GPIO IRQ implementation can be used."
 FEATURES_CONFLICT += periph_usbdev:tinyusb_device
 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
@@ -4,8 +4,8 @@ CPU_MODEL = esp32-wrover
 include $(RIOTBOARD)/common/esp32/Makefile.features
 
 # additional features provided by the board
-FEATURES_PROVIDED += esp_eth
 FEATURES_PROVIDED += periph_adc
+FEATURES_PROVIDED += periph_eth
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_pwm
 

@@ -19,7 +19,7 @@ FEATURES_CONFLICT += periph_sdmmc:periph_spi
 FEATURES_CONFLICT_MSG += "SD/MMC and SPI cannot be used at the same time on this board."
 
 # unique features of the board
-FEATURES_PROVIDED += esp_eth        # Ethernet MAC (EMAC)
 FEATURES_PROVIDED += periph_can     # CAN peripheral interface
+FEATURES_PROVIDED += periph_eth     # Ethernet MAC (EMAC)
 
 FEATURES_PROVIDED += arduino_pins
diff --git a/boards/native/common_features.inc.mk b/boards/native/common_features.inc.mk
@@ -8,6 +8,5 @@ FEATURES_PROVIDED += periph_pwm
 FEATURES_PROVIDED += periph_qdec
 
 # Put other features for this board (in alphabetical order)
-FEATURES_PROVIDED += netif_ethernet
 FEATURES_PROVIDED += motor_driver
-FEATURES_PROVIDED += netif
+FEATURES_PROVIDED += netif_ethernet
@@ -14,8 +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 += netif
 FEATURES_PROVIDED += riotboot
 FEATURES_PROVIDED += tinyusb_device
 

@@ -14,8 +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 += netif
 FEATURES_PROVIDED += tinyusb_device
 
 # load the common Makefile.features for Nucleo boards

@@ -13,8 +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 += netif
 FEATURES_PROVIDED += tinyusb_device
 
 # load the common Makefile.features for Nucleo boards

@@ -20,8 +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 += netif
 FEATURES_PROVIDED += riotboot
 FEATURES_PROVIDED += tinyusb_device
 

@@ -19,7 +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 += netif
 FEATURES_PROVIDED += riotboot
 FEATURES_PROVIDED += tinyusb_device
diff --git a/boards/stm32f746g-disco/features-shared.mk b/boards/stm32f746g-disco/features-shared.mk
@@ -17,6 +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 += netif
 FEATURES_PROVIDED += tinyusb_device
@@ -32,7 +32,7 @@ ifneq (,$(filter esp_ble,$(USEMODULE)))
 endif
 
 ifneq (,$(filter esp_eth,$(USEMODULE)))
-  FEATURES_REQUIRED += esp_eth
+  FEATURES_REQUIRED += periph_eth
   USEMODULE += esp_idf_eth
   USEMODULE += esp_idf_event
   USEMODULE += esp_idf_gpio

diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh
@@ -16,14 +16,14 @@
 : "${RIOTBASE:="$(cd "$(dirname "$0")/../../../" || exit; pwd)"}"

 : "${RIOTTOOLS:=${RIOTBASE}/dist/tools}"
 . "${RIOTTOOLS}"/ci/github_annotate.sh

 SCRIPT_PATH=dist/tools/buildsystem_sanity_check/check.sh


 tab_indent() {
    # Ident using 'bashism' to to the tab compatible with 'bsd-sed'
    sed 's/^/\'$'\t/'
 }

 prepend() {
@@ -34,13 +34,13 @@
 }

 error_with_message() {
    while read INPUT; do
        if github_annotate_is_on; then
            MESSAGE="${1}"
            FILE=$(echo "${INPUT}" | cut -d: -f1)
            LINE=$(echo "${INPUT}" | cut -d: -f2)
            MATCH=$(echo "${INPUT}" | cut -d: -f3)
            if [[ $var =~ ^[0-9]+$ ]] || [  -z "$MATCH" ]; then
                # line is not provided in grep pattern
                LINE=0
            fi
@@ -74,6 +74,12 @@
     # 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
+    # already provided to avoid clutter in each boards Makefile.features.
+    # E.g. `periph_eth` will pull in `netif_ethernet`, which
+    # will pull in `netif`.
+    pathspec+=(':!Makefile.features')
+
     git -C "${RIOTBASE}" grep -n "${patterns[@]}" -- "${pathspec[@]}" \
         | error_with_message 'Modules should not check the content of FEATURES_PROVIDED/REQUIRED/OPTIONAL'
 }
@@ -172,7 +178,7 @@
    # Only run if there are patterns, otherwise it matches everything
    if [ ${#patterns[@]} -ne 0 ]; then
        git -C "${RIOTBASE}" grep -n "${patterns[@]}" -- "${pathspec[@]}" \
            | error_with_message 'Variables must only be exported in `makefiles/vars.inc.mk`'
    fi
 }

@@ -287,14 +293,14 @@
    local patterns=()
    local pathspec=()

    patterns+=(-e '/$(BOARD)/')

    pathspec+=('boards/')
    # boards/common/nrf52 uses a hack to resolve dependencies early
    pathspec+=(':!boards/common/nrf52/Makefile.include')

    git -C "${RIOTBASE}" grep -n "${patterns[@]}" -- "${pathspec[@]}" \
        | error_with_message 'Code in boards/ should not use $(BOARDS) to reference files since this breaks external BOARDS changing BOARDSDIR"'
 }

 check_no_pseudomodules_in_makefile_dep() {

diff --git a/features.yaml b/features.yaml
@@ -138,10 +138,6 @@ groups:
     - title: ESP Specific Features
       help: These features are only available on (some) ESP MCUs.
       features:
-      - name: esp_eth
-        help: >
-              An ESP Ethernet peripherals is available.
-              (FIXME: `periph_eth` instead.)
       - name: esp_jtag
         help: The MCU supports JTAG for programming and debugging. Enable this
               feature to expose the interface at the cost of having fewer pins as

diff --git a/makefiles/features_existing.inc.mk b/makefiles/features_existing.inc.mk
@@ -114,7 +114,6 @@ FEATURES_EXISTING := \
     esp_ble \
     esp_ble_esp32 \
     esp_ble_esp32c3 \
-    esp_eth \
     esp_hw_counter \
     esp_jtag \
     esp_now \