Merge branch 'master' into feature/wpa2_enterprise

Conflicts:
	components/esp32/component.mk
	components/wpa_supplicant/component.mk

diff --cc components/esp32/component.mk
index 14a56ff7a6b4078c9108021bbeb16bee73084539,8059d157c5940a4215ed8b45d565c61bc7e48dd2..6c0d65d9c5a4911f85129dabb61d7435cb0178e3
--- 1/components/esp32/component.mk
--- 2/components/esp32/component.mk
+++ b/components/esp32/component.mk
@@@ -4,13 -4,7 +4,7 @@@
  
  COMPONENT_SRCDIRS := . hwcrypto
  
- LIBS := core net80211 phy rtc pp wpa smartconfig coexist wpa2
 -LIBS := core net80211 phy rtc pp wpa smartconfig coexist wps
++LIBS := core net80211 phy rtc pp wpa smartconfig coexist wps wpa2
  
  LINKER_SCRIPTS += -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld
  

diff --cc components/wpa_supplicant/component.mk
index 1189bb257a325bf3c71a1a782dc94843d09f4310,b01eb83be9bd15cdfd719c181a4e0b22ad32b992..9117640c6afb6e129c03df4b2f5ce51a91f39ec6
--- 1/components/wpa_supplicant/component.mk
--- 2/components/wpa_supplicant/component.mk
+++ b/components/wpa_supplicant/component.mk
@@@ -1,6 -1,4 +1,4 @@@
  COMPONENT_ADD_INCLUDEDIRS := include port/include
  COMPONENT_SRCDIRS := src/crypto
  
 -CFLAGS += -DEMBEDDED_SUPP -D__ets__ -Wno-strict-aliasing
 +CFLAGS += -DEMBEDDED_SUPP -D__ets__ -Wno-strict-aliasing -D__ESP32_SUPP_TYPE__
- 
- include $(IDF_PATH)/make/component_common.mk