RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #18394 from gschorcht/cpu/esp32/fix_kconfig_for_esp_eth

Browse Source 
cpu/esp32: fix provided features and Kconfig for esp_eth
This commit is contained in:
benpicco 2022-08-05 19:47:03 +02:00 committed by GitHub
commit 004ac82af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.murdock
View File

@ -34,6 +34,7 @@ derfmega128
dwm1001 dwm1001
esp32-ci esp32-ci
esp32-heltec-lora32-v2 esp32-heltec-lora32-v2
esp32-olimex-evb
esp8266-ci esp8266-ci
esp8266-esp-12x esp8266-esp-12x
hamilton hamilton

4
boards/esp32-ethernet-kit-v1_0/Kconfig
View File

@ -13,13 +13,11 @@ config BOARD_ESP32_ETHERNET_KIT_V1_0
default y default y
select BOARD_COMMON_ESP32 select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROVER_B select CPU_MODEL_ESP32_WROVER_B
select HAS_ESP_ETH
select HAS_ESP_JTAG select HAS_ESP_JTAG
select HAS_PERIPH_ADC select HAS_PERIPH_ADC
select HAS_PERIPH_ETH
select HAS_PERIPH_I2C select HAS_PERIPH_I2C
select HAS_PERIPH_PWM select HAS_PERIPH_PWM
select HAS_PERIPH_SPI if !MODULE_ESP_JTAG select HAS_PERIPH_SPI if !MODULE_ESP_JTAG
select HAVE_ESP_ETH
source "$(RIOTBOARD)/common/esp32/Kconfig" source "$(RIOTBOARD)/common/esp32/Kconfig"

2
boards/esp32-ethernet-kit-v1_0/Makefile.features
View File

@ -4,8 +4,8 @@ CPU_MODEL = esp32-wrover
include $(RIOTBOARD)/common/esp32/Makefile.features include $(RIOTBOARD)/common/esp32/Makefile.features
# additional features provided by the board # additional features provided by the board
FEATURES_PROVIDED += esp_eth
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_eth
FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_pwm

2
boards/esp32-ethernet-kit-v1_1/Kconfig
View File

@ -13,9 +13,9 @@ config BOARD_ESP32_ETHERNET_KIT_V1_1
default y default y
select BOARD_COMMON_ESP32 select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROVER_B select CPU_MODEL_ESP32_WROVER_B
select HAS_ESP_ETH
select HAS_ESP_JTAG select HAS_ESP_JTAG
select HAS_PERIPH_ADC select HAS_PERIPH_ADC
select HAS_PERIPH_ETH
select HAS_PERIPH_I2C select HAS_PERIPH_I2C
select HAS_PERIPH_PWM select HAS_PERIPH_PWM
select HAS_PERIPH_SPI if !MODULE_ESP_JTAG select HAS_PERIPH_SPI if !MODULE_ESP_JTAG

2
boards/esp32-ethernet-kit-v1_2/Kconfig
View File

@ -13,9 +13,9 @@ config BOARD_ESP32_ETHERNET_KIT_V1_2
default y default y
select BOARD_COMMON_ESP32 select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROVER_E select CPU_MODEL_ESP32_WROVER_E
select HAS_ESP_ETH
select HAS_ESP_JTAG select HAS_ESP_JTAG
select HAS_PERIPH_ADC select HAS_PERIPH_ADC
select HAS_PERIPH_ETH
select HAS_PERIPH_I2C select HAS_PERIPH_I2C
select HAS_PERIPH_PWM select HAS_PERIPH_PWM
select HAS_PERIPH_SPI if !MODULE_ESP_JTAG select HAS_PERIPH_SPI if !MODULE_ESP_JTAG

4
boards/esp32-olimex-evb/Kconfig
View File

@ -13,14 +13,12 @@ config BOARD_ESP32_OLIMEX_EVB
select BOARD_COMMON_ESP32 select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROOM_32 select CPU_MODEL_ESP32_WROOM_32
select HAS_ARDUINO select HAS_ARDUINO
select HAS_ESP_ETH
select HAS_PERIPH_ADC if USEMODULE_OLIMEX_ESP32_GATEWAY select HAS_PERIPH_ADC if USEMODULE_OLIMEX_ESP32_GATEWAY
select HAS_PERIPH_I2C select HAS_PERIPH_I2C
select HAS_PERIPH_PWM select HAS_PERIPH_PWM
select HAS_PERIPH_SPI select HAS_PERIPH_SPI
select HAS_PERIPH_ETH
select HAS_PERIPH_CAN select HAS_PERIPH_CAN
select HAS_PERIPH_IR select HAS_PERIPH_IR
select HAVE_ESP_ETH
source "$(RIOTBOARD)/common/esp32/Kconfig" source "$(RIOTBOARD)/common/esp32/Kconfig"

2
boards/esp32-olimex-evb/Makefile.features
View File

@ -12,7 +12,7 @@ FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_spi
# unique features of the board # unique features of the board
FEATURES_PROVIDED += periph_eth # Ethernet MAC (EMAC) FEATURES_PROVIDED += esp_eth # Ethernet MAC (EMAC)
FEATURES_PROVIDED += periph_can # CAN peripheral interface FEATURES_PROVIDED += periph_can # CAN peripheral interface
FEATURES_PROVIDED += periph_ir # IR peripheral interface FEATURES_PROVIDED += periph_ir # IR peripheral interface

2
cpu/esp32/Makefile.dep
View File

@ -18,13 +18,13 @@ ifneq (,$(filter cpp,$(USEMODULE)))
endif endif
ifneq (,$(filter esp_eth,$(USEMODULE))) ifneq (,$(filter esp_eth,$(USEMODULE)))
FEATURES_REQUIRED += esp_eth
USEMODULE += esp_idf_eth USEMODULE += esp_idf_eth
USEMODULE += esp_idf_event USEMODULE += esp_idf_event
USEMODULE += esp_idf_gpio USEMODULE += esp_idf_gpio
USEMODULE += esp_idf_spi_flash USEMODULE += esp_idf_spi_flash
USEMODULE += netdev_eth USEMODULE += netdev_eth
USEMODULE += netopt USEMODULE += netopt
FEATURES_REQUIRED += periph_eth
USEMODULE += ztimer_msec USEMODULE += ztimer_msec
endif endif

8
cpu/esp32/esp-eth/Kconfig
View File

@ -9,16 +9,16 @@ config MODULE_ESP_ETH
bool "ESP32 Ethernet device" bool "ESP32 Ethernet device"
depends on TEST_KCONFIG depends on TEST_KCONFIG
depends on CPU_FAM_ESP32 depends on CPU_FAM_ESP32
depends on HAS_PERIPH_ETH depends on HAS_ESP_ETH
select MODULE_ESP_FREERTOS
select MODULE_ESP_IDF_ETH select MODULE_ESP_IDF_ETH
select MODULE_ESP_IDF_ETH_PHY select MODULE_ESP_IDF_EVENT
select MODULE_ESP_IDF_SPI_FLASH
select MODULE_NETDEV_ETH select MODULE_NETDEV_ETH
select MODULE_NETOPT select MODULE_NETOPT
select MODULE_ZTIMER select MODULE_ZTIMER
select MODULE_ZTIMER_MSEC select MODULE_ZTIMER_MSEC
config HAVE_ESP_ETH config HAS_ESP_ETH
bool bool
select MODULE_ESP_ETH if MODULE_NETDEV_DEFAULT select MODULE_ESP_ETH if MODULE_NETDEV_DEFAULT
help help

2
tests/driver_esp_eth/Kconfig
View File

@ -9,4 +9,4 @@ config APPLICATION
bool bool
default y default y
depends on HAS_ARCH_ESP32 depends on HAS_ARCH_ESP32
depends on HAS_PERIPH_ETH depends on HAS_ESP_ETH

1
tests/driver_esp_eth/Makefile
View File

@ -7,7 +7,6 @@ USEMODULE += test_utils_netdev_eth_minimal
# the driver to test # the driver to test
USEMODULE += esp_eth USEMODULE += esp_eth
FEATURES_REQUIRED += arch_esp32 FEATURES_REQUIRED += arch_esp32
FEATURES_REQUIRED += periph_eth
INCLUDES += -I$(APPDIR) INCLUDES += -I$(APPDIR)