diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 82a24de75a28..25ce6bff1c4c 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -39,3 +39,14 @@ jobs:
       run: source tools/ci.sh && ci_esp32_idf44_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
+
+  build_idf522:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Initialize lv_bindings submodule
+      run: git submodule update --init --recursive lib/lv_bindings
+    - name: Install packages
+      run: source tools/ci.sh && ci_esp32_idf522_setup
+    - name: Build
+      run: source tools/ci.sh && ci_esp32_build
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index b186cc1685bc..ebe2b3086193 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -108,7 +108,6 @@ set(IDF_COMPONENTS
     bootloader_support
     bt
     driver
-    esp_adc_cal
     esp_common
     esp_eth
     esp_event
@@ -120,21 +119,27 @@ set(IDF_COMPONENTS
     log
     lwip
     mbedtls
-    mdns
     newlib
     nvs_flash
     sdmmc
     soc
     spi_flash
-    tcpip_adapter
     ulp
     vfs
     xtensa
     esp_http_client
     esp-tls
-    nghttp
 )
 
+if(IDF_VERSION_MAJOR GREATER_EQUAL 5)
+    list(APPEND IDF_COMPONENTS esp_adc)
+else()
+    list(APPEND IDF_COMPONENTS esp_adc_cal)
+    list(APPEND IDF_COMPONENTS mdns)
+    list(APPEND IDF_COMPONENTS tcpip_adapter)
+    list(APPEND IDF_COMPONENTS nghttp)
+endif()
+
 if(IDF_VERSION_MINOR GREATER_EQUAL 1 OR IDF_VERSION_MAJOR GREATER_EQUAL 5)
     list(APPEND IDF_COMPONENTS esp_netif)
 endif()
@@ -150,19 +155,24 @@ if(IDF_VERSION_MINOR GREATER_EQUAL 3 OR IDF_VERSION_MAJOR GREATER_EQUAL 5)
     list(APPEND IDF_COMPONENTS hal)
 endif()
 
-if(IDF_TARGET STREQUAL "esp32")
-    list(APPEND IDF_COMPONENTS esp32)
-elseif(IDF_TARGET STREQUAL "esp32c3")
-    list(APPEND IDF_COMPONENTS esp32c3)
-    list(APPEND IDF_COMPONENTS riscv)
-elseif(IDF_TARGET STREQUAL "esp32s2")
-    list(APPEND IDF_COMPONENTS esp32s2)
-    list(APPEND IDF_COMPONENTS tinyusb)
-elseif(IDF_TARGET STREQUAL "esp32s3")
-    list(APPEND IDF_COMPONENTS esp32s3)
-    list(APPEND IDF_COMPONENTS tinyusb)
+if(IDF_VERSION_MAJOR GREATER_EQUAL 5)
+    list(APPEND IDF_COMPONENTS soc)
+else()
+    if(IDF_TARGET STREQUAL "esp32")
+        list(APPEND IDF_COMPONENTS esp32)
+    elseif(IDF_TARGET STREQUAL "esp32c3")
+        list(APPEND IDF_COMPONENTS esp32c3)
+        list(APPEND IDF_COMPONENTS riscv)
+    elseif(IDF_TARGET STREQUAL "esp32s2")
+        list(APPEND IDF_COMPONENTS esp32s2)
+        list(APPEND IDF_COMPONENTS tinyusb)
+    elseif(IDF_TARGET STREQUAL "esp32s3")
+        list(APPEND IDF_COMPONENTS esp32s3)
+        list(APPEND IDF_COMPONENTS tinyusb)
+    endif()
 endif()
 
+
 # Register the main IDF component.
 idf_component_register(
     SRCS