Merge pull request #18218 from gschorcht/boards/esp32/cleanup_ci_comp…

…ilation boards/esp32: cleanup CI compilation for esp_wifi_enterprise
RIOT-OS · Jun 19, 2022 · 1638606 · 1638606
2 parents e32c19f + 3414629
commit 1638606
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git 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"
 

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
@@ -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