From 54c1cd673efa6a1bbf3c9867ec992b4c50896bfa Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Thu, 16 Jun 2022 14:11:58 +0200 Subject: [PATCH 1/2] boards/esp32-wrover-kit: revert changes in commit b74c456 In the board definition of `esp32_wrover_kit` default values for `ESP_WIFI_EAP_USER` and `ESP_WIFI_EAP_PASS` had to be defined because this board was used in the CI to compile the optional module `esp_wifi_enterprise`. Now that the CI compilation for the `esp_wifi_enterprise` module is realized by an external board definition `esp32-ci`, these default values should be removed to make the compilation fail if the user did not define these variables. --- boards/esp32-wrover-kit/include/board.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/boards/esp32-wrover-kit/include/board.h b/boards/esp32-wrover-kit/include/board.h index 5275f0218343..95f465e8aa9c 100644 --- a/boards/esp32-wrover-kit/include/board.h +++ b/boards/esp32-wrover-kit/include/board.h @@ -125,23 +125,6 @@ #endif /** @} */ -#ifndef DOXYGEN -/** - * @name Default configuration parameters for ESP WiFi Enterprise netdev - * @{ - */ -#ifndef ESP_WIFI_EAP_USER -/** User name used in phase 2 (inner) EAP authentication. */ -#define ESP_WIFI_EAP_USER "riot-os@riot-os.org" -#endif /* ESP_WIFI_EAP_USER */ - -#ifndef ESP_WIFI_EAP_PASS -/** Password used in phase 2 (inner) EAP authentication. */ -#define ESP_WIFI_EAP_PASS "riot-os" -#endif /* ESP_WIFI_EAP_PASS */ -/** @} */ -#endif /* !DOXYGEN */ - /* include common board definitions as last step */ #include "board_common.h" From 3414629614a446049f3c2f4d9cad3ad3eb5ed4d5 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Thu, 16 Jun 2022 14:20:11 +0200 Subject: [PATCH 2/2] boards/esp32-ci: define ESP_WIFI_EAP_* variables `ESP_WIFI_EAP_USER` and `ESP_WIFI_EAP_PASS` have to be defined because this board is used in the CI to compile the optional module `esp_wifi_enterprise`. --- .../esp-ci-boards/esp32-ci/Makefile.include | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/external_board_dirs/esp-ci-boards/esp32-ci/Makefile.include b/tests/external_board_dirs/esp-ci-boards/esp32-ci/Makefile.include index c2608e102b12..b4fdf5447b31 100644 --- a/tests/external_board_dirs/esp-ci-boards/esp32-ci/Makefile.include +++ b/tests/external_board_dirs/esp-ci-boards/esp32-ci/Makefile.include @@ -2,4 +2,9 @@ # to also include the main board header INCLUDES += $(addprefix -I,$(wildcard $(RIOTBOARD)/esp32-wrover-kit/include)) +# ESP_WIFI_EAP_USER and ESP_WIFI_EAP_PASS have to be defined to compile the +# optional module esp_wifi_enterprise in CI +CFLAGS += -DESP_WIFI_EAP_USER=\"riot@riot-os.org\" +CFLAGS += -DESP_WIFI_EAP_PASS=\"riot\" + include $(RIOTBOARD)/esp32-wrover-kit/Makefile.include