Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/esp32: fix provided features and Kconfig for esp_eth #18394

Merged
merged 8 commits into from
Aug 5, 2022
Merged

cpu/esp32: fix provided features and Kconfig for esp_eth #18394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c28fa8
cpu/esp32: replace feature periph_eth by esp_eth
gschorcht Aug 2, 2022
3f7416d
boards/esp32: replace feature periph_eth by esp_eth
gschorcht Aug 2, 2022
34633a5
tests/driver_esp_eth: replace feature periph_eth by esp_eth
gschorcht Aug 2, 2022
71c7e9e
cpu/esp32: replace HAS_PERIPH_ETH by HAS_ESP_ETH in Kconfig
gschorcht Aug 2, 2022
5b0b0e0
boards/esp32: replace HAS_PERIPH_ETH by HAS_ESP_ETH in Kconfig
gschorcht Aug 2, 2022
dff5c8d
cpu/esp32: fix Kconfig for esp_eth
gschorcht Aug 2, 2022
e8c8c8d
tests/driver_esp_eth: replace HAS_PERIPH_ETH by HAS_ESP_ETH in Kconfig
gschorcht Aug 2, 2022
2347e80
murdock: add an ESP32 board with feature esp_eth
gschorcht Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .murdock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ derfmega128
dwm1001
esp32-ci
esp32-heltec-lora32-v2
esp32-olimex-evb
esp8266-ci
esp8266-esp-12x
hamilton
Expand Down
4 changes: 1 addition & 3 deletions boards/esp32-ethernet-kit-v1_0/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ config BOARD_ESP32_ETHERNET_KIT_V1_0
default y
select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROVER_B
select HAS_ESP_ETH
select HAS_ESP_JTAG
select HAS_PERIPH_ADC
select HAS_PERIPH_ETH
select HAS_PERIPH_I2C
select HAS_PERIPH_PWM
select HAS_PERIPH_SPI if !MODULE_ESP_JTAG

select HAVE_ESP_ETH

source "$(RIOTBOARD)/common/esp32/Kconfig"
2 changes: 1 addition & 1 deletion boards/esp32-ethernet-kit-v1_0/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion boards/esp32-ethernet-kit-v1_1/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ config BOARD_ESP32_ETHERNET_KIT_V1_1
default y
select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROVER_B
select HAS_ESP_ETH
select HAS_ESP_JTAG
select HAS_PERIPH_ADC
select HAS_PERIPH_ETH
select HAS_PERIPH_I2C
select HAS_PERIPH_PWM
select HAS_PERIPH_SPI if !MODULE_ESP_JTAG
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32-ethernet-kit-v1_2/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ config BOARD_ESP32_ETHERNET_KIT_V1_2
default y
select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROVER_E
select HAS_ESP_ETH
select HAS_ESP_JTAG
select HAS_PERIPH_ADC
select HAS_PERIPH_ETH
select HAS_PERIPH_I2C
select HAS_PERIPH_PWM
select HAS_PERIPH_SPI if !MODULE_ESP_JTAG
Expand Down
4 changes: 1 addition & 3 deletions boards/esp32-olimex-evb/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@ config BOARD_ESP32_OLIMEX_EVB
select BOARD_COMMON_ESP32
select CPU_MODEL_ESP32_WROOM_32
select HAS_ARDUINO
select HAS_ESP_ETH
select HAS_PERIPH_ADC if USEMODULE_OLIMEX_ESP32_GATEWAY
select HAS_PERIPH_I2C
select HAS_PERIPH_PWM
select HAS_PERIPH_SPI
select HAS_PERIPH_ETH
select HAS_PERIPH_CAN
select HAS_PERIPH_IR

select HAVE_ESP_ETH

source "$(RIOTBOARD)/common/esp32/Kconfig"
2 changes: 1 addition & 1 deletion boards/esp32-olimex-evb/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_spi

# 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_ir # IR peripheral interface

Expand Down
2 changes: 1 addition & 1 deletion cpu/esp32/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ ifneq (,$(filter cpp,$(USEMODULE)))
endif

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

Expand Down
8 changes: 4 additions & 4 deletions cpu/esp32/esp-eth/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ config MODULE_ESP_ETH
bool "ESP32 Ethernet device"
depends on TEST_KCONFIG
depends on CPU_FAM_ESP32
depends on HAS_PERIPH_ETH
select MODULE_ESP_FREERTOS
depends on HAS_ESP_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_NETOPT
select MODULE_ZTIMER
select MODULE_ZTIMER_MSEC

config HAVE_ESP_ETH
config HAS_ESP_ETH
bool
select MODULE_ESP_ETH if MODULE_NETDEV_DEFAULT
help
Expand Down
2 changes: 1 addition & 1 deletion tests/driver_esp_eth/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ config APPLICATION
bool
default y
depends on HAS_ARCH_ESP32
depends on HAS_PERIPH_ETH
depends on HAS_ESP_ETH
1 change: 0 additions & 1 deletion tests/driver_esp_eth/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ USEMODULE += test_utils_netdev_eth_minimal
# the driver to test
USEMODULE += esp_eth
FEATURES_REQUIRED += arch_esp32
FEATURES_REQUIRED += periph_eth

INCLUDES += -I$(APPDIR)

Expand Down