diff --git a/components/esp_common/include/esp_crc.h b/components/esp_common/include/esp_crc.h
index 23a04876a..cc14c6ace 100644
--- a/components/esp_common/include/esp_crc.h
+++ b/components/esp_common/include/esp_crc.h
@@ -24,6 +24,10 @@ extern "C" {
 #include "esp32/rom/crc.h"
 #endif
 
+#if defined(CONFIG_IDF_TARGET_ESP32S2)
+#include "esp32s2/rom/crc.h"
+#endif
+
 /******************* Polynomials Used in the CRC APIs ****************************
 * CRC-8        x8+x2+x1+1                                              0x07
 * CRC16-CCITT  x16+x12+x5+1                                            0x1021
@@ -43,6 +47,7 @@ static inline uint32_t esp_crc32_le(uint32_t crc, uint8_t const *buf, uint32_t l
     return crc32_le(crc, buf, len);
 }
 
+#if defined(CONFIG_IDF_TARGET_ESP32)
 /**
 * @brief CRC32 value in big endian.
 *
@@ -55,6 +60,7 @@ static inline uint32_t esp_crc32_be(uint32_t crc, uint8_t const *buf, uint32_t l
 {
     return crc32_be(crc, buf, len);
 }
+#endif
 
 /**
 * @brief CRC16 value in little endian.
@@ -69,6 +75,7 @@ static inline uint16_t esp_crc16_le(uint16_t crc, uint8_t const *buf, uint32_t l
     return crc16_le(crc, buf, len);
 }
 
+#if defined(CONFIG_IDF_TARGET_ESP32)
 /**
 * @brief CRC16 value in big endian.
 *
@@ -81,6 +88,7 @@ static inline uint16_t esp_crc16_be(uint16_t crc, uint8_t const *buf, uint32_t l
 {
     return crc16_be(crc, buf, len);
 }
+#endif
 
 /**
 * @brief CRC8 value in little endian.
@@ -95,6 +103,7 @@ static inline uint8_t esp_crc8_le(uint8_t crc, uint8_t const *buf, uint32_t len)
     return crc8_le(crc, buf, len);
 }
 
+#if defined(CONFIG_IDF_TARGET_ESP32)
 /**
 * @brief CRC8 value in big endian.
 *
@@ -107,6 +116,7 @@ static inline uint8_t esp_crc8_be(uint8_t crc, uint8_t const *buf, uint32_t len)
 {
     return crc8_be(crc, buf, len);
 }
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index d2c242d4a..efee8ef3a 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit d2c242d4a5d2fe2099dc8453df2c5b31297d7ff7
+Subproject commit efee8ef3ae0070c802676ad8b87dc2243159686d
diff --git a/examples/wifi/espnow/README.md b/examples/wifi/espnow/README.md
index 19ca66f33..db07648a6 100644
--- a/examples/wifi/espnow/README.md
+++ b/examples/wifi/espnow/README.md
@@ -1,6 +1,3 @@
-| Supported Targets | ESP32 |
-| ----------------- | ----- |
-
 # ESPNOW Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md
index ffe84e43b..ce7247f05 100644
--- a/examples/wifi/iperf/README.md
+++ b/examples/wifi/iperf/README.md
@@ -1,6 +1,3 @@
-| Supported Targets | ESP32 |
-| ----------------- | ----- |
-
 # Iperf Example
 
 ## Note about iperf version
diff --git a/examples/wifi/simple_sniffer/README.md b/examples/wifi/simple_sniffer/README.md
index a54076633..7c8ba2d4a 100644
--- a/examples/wifi/simple_sniffer/README.md
+++ b/examples/wifi/simple_sniffer/README.md
@@ -1,6 +1,3 @@
-| Supported Targets | ESP32 |
-| ----------------- | ----- |
-
 # Simple Sniffer Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/wifi/simple_sniffer/main/Kconfig.projbuild b/examples/wifi/simple_sniffer/main/Kconfig.projbuild
index c85abc650..1de70f187 100644
--- a/examples/wifi/simple_sniffer/main/Kconfig.projbuild
+++ b/examples/wifi/simple_sniffer/main/Kconfig.projbuild
@@ -9,7 +9,8 @@ menu "Example Configuration"
 
     choice SNIFFER_PCAP_DESTINATION
         prompt "Select destination to store pcap file"
-        default SNIFFER_PCAP_DESTINATION_SD
+        default SNIFFER_PCAP_DESTINATION_SD if IDF_TARGET_ESP32
+        default SNIFFER_PCAP_DESTINATION_JTAG if IDF_TARGET_ESP32S2
         help
             Select where to store the pcap file.
             Currently support storing files to SD card or to host via JTAG interface.
diff --git a/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c b/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c
index a842abe83..2853a4be8 100644
--- a/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c
+++ b/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c
@@ -19,8 +19,10 @@
 #include "esp_wifi.h"
 #include "esp_err.h"
 #include "esp_log.h"
+#if CONFIG_SNIFFER_PCAP_DESTINATION_SD
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
+#endif
 #include "nvs_flash.h"
 #include "sdmmc_cmd.h"
 #include "cmd_system.h"