From 1dbcdd3d4b54b7c8f354268ebeb6d6e91309ef43 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Thu, 14 May 2020 13:32:19 +0200 Subject: [PATCH 1/2] cpu/esp32: Allow compilation with external boards Replace `$(RIOTBOARD)/$(BOARD)` with `$(BOARDDIR)`, which also works for external boards. --- cpu/esp32/vendor/esp-idf/wpa_supplicant/port/Makefile | 2 +- cpu/esp32/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile | 2 +- .../vendor/esp-idf/wpa_supplicant/src/wpa2/eap_peer/Makefile | 2 +- cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/tls/Makefile | 2 +- cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/utils/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cpu/esp32/vendor/esp-idf/wpa_supplicant/port/Makefile b/cpu/esp32/vendor/esp-idf/wpa_supplicant/port/Makefile index 5628a427bc..3a0c833214 100644 --- a/cpu/esp32/vendor/esp-idf/wpa_supplicant/port/Makefile +++ b/cpu/esp32/vendor/esp-idf/wpa_supplicant/port/Makefile @@ -11,7 +11,7 @@ CFLAGS += -D__ets__ include $(RIOTCPU)/$(CPU)/Makefile.include -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include +INCLUDES += -I$(BOARDDIR)/include INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTBASE)/drivers/include INCLUDES += -I$(RIOTCPU)/$(CPU)/include diff --git a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile index c853b03be8..28543213c6 100644 --- a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile +++ b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile @@ -16,4 +16,4 @@ include $(RIOTCPU)/$(CPU)/Makefile.include INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/include/log INCLUDES += -I$(RIOTCPU)/$(CPU)/include -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include +INCLUDES += -I$(BOARDDIR)/include diff --git a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/eap_peer/Makefile b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/eap_peer/Makefile index 0d30181033..b95b5502be 100644 --- a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/eap_peer/Makefile +++ b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/eap_peer/Makefile @@ -17,4 +17,4 @@ include $(RIOTCPU)/$(CPU)/Makefile.include INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/include/log INCLUDES += -I$(RIOTCPU)/$(CPU)/include -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include +INCLUDES += -I$(BOARDDIR)/include diff --git a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/tls/Makefile b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/tls/Makefile index 8b996a6afa..940cd49a5b 100644 --- a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/tls/Makefile +++ b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/tls/Makefile @@ -16,4 +16,4 @@ include $(RIOTCPU)/$(CPU)/Makefile.include INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/include/log INCLUDES += -I$(RIOTCPU)/$(CPU)/include -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include +INCLUDES += -I$(BOARDDIR)/include diff --git a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/utils/Makefile b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/utils/Makefile index 92a2b91f3e..a001752c37 100644 --- a/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/utils/Makefile +++ b/cpu/esp32/vendor/esp-idf/wpa_supplicant/src/wpa2/utils/Makefile @@ -16,4 +16,4 @@ include $(RIOTCPU)/$(CPU)/Makefile.include INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/include/log INCLUDES += -I$(RIOTCPU)/$(CPU)/include -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include +INCLUDES += -I$(BOARDDIR)/include From fc28ba5c082a9f2f0a785937658641c819bd435c Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Thu, 14 May 2020 13:35:51 +0200 Subject: [PATCH 2/2] cpu/esp8266: Allow compilation with external boards Replace `$(RIOTBOARD)/$(BOARD)` with `$(BOARDDIR)`, which also works for external boards. --- cpu/esp8266/vendor/esp-idf/wpa_supplicant/port/Makefile | 2 +- cpu/esp8266/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/esp8266/vendor/esp-idf/wpa_supplicant/port/Makefile b/cpu/esp8266/vendor/esp-idf/wpa_supplicant/port/Makefile index 1280d9b90a..df0f858bc9 100644 --- a/cpu/esp8266/vendor/esp-idf/wpa_supplicant/port/Makefile +++ b/cpu/esp8266/vendor/esp-idf/wpa_supplicant/port/Makefile @@ -16,4 +16,4 @@ INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTBASE)/sys/include INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/log/include INCLUDES += -I$(RIOTCPU)/$(CPU)/include -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include +INCLUDES += -I$(BOARDDIR)/include diff --git a/cpu/esp8266/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile b/cpu/esp8266/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile index 5763af65ed..fa033d8e33 100644 --- a/cpu/esp8266/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile +++ b/cpu/esp8266/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile @@ -17,5 +17,5 @@ INCLUDES += -I$(RIOTBASE)/core/include INCLUDES += -I$(RIOTBASE)/sys/include INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/log/include INCLUDES += -I$(RIOTCPU)/$(CPU)/include -INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include +INCLUDES += -I$(BOARDDIR)/include