diff --git a/.github/workflows/build_esp32.yml b/.github/workflows/build_esp32.yml index 8bc02b4ff..b7acde11c 100644 --- a/.github/workflows/build_esp32.yml +++ b/.github/workflows/build_esp32.yml @@ -13,7 +13,7 @@ jobs: # --------------------------------------- # Build ESP32SX family # --------------------------------------- - ESP32-S2: + ESP: runs-on: ubuntu-latest strategy: fail-fast: false @@ -61,18 +61,18 @@ jobs: run: git submodule update --init lib/tinyusb lib/uf2 - name: Build - run: docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.4 make -C ports/esp32s2/ BOARD=${{ matrix.board }} all self-update copy-artifact + run: docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.4 make -C ports/espressif/ BOARD=${{ matrix.board }} all self-update copy-artifact - uses: actions/upload-artifact@v2 with: name: ${{ matrix.board }} - path: ports/esp32s2/_bin/${{ matrix.board }}/ + path: ports/espressif/_bin/${{ matrix.board }}/ - name: Create Release Asset if: ${{ github.event_name == 'release' }} run: | - #for f in ports/esp32s2/_bin/${{ matrix.board }}/*; do mv $f ${f%.*}-${{ github.event.release.tag_name }}."${f#*.}"; done - zip -jr tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.zip ports/esp32s2/_bin/${{ matrix.board }} + #for f in ports/espressif/_bin/${{ matrix.board }}/*; do mv $f ${f%.*}-${{ github.event.release.tag_name }}."${f#*.}"; done + zip -jr tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.zip ports/espressif/_bin/${{ matrix.board }} - name: Upload Release Asset uses: actions/upload-release-asset@v1 @@ -92,6 +92,6 @@ jobs: if: ${{ github.event_name == 'release' }} with: upload_url: ${{ github.event.release.upload_url }} - asset_path: ports/esp32s2/_bin/${{ matrix.board }}/update-tinyuf2.uf2 + asset_path: ports/espressif/_bin/${{ matrix.board }}/update-tinyuf2.uf2 asset_name: update-tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.uf2 asset_content_type: application/x-binary diff --git a/README.md b/README.md index ccca0f313..019dee3c6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This repo is cross-platform UF2 Bootloader projects for MCUs based on [TinyUSB]( ├── apps # Useful applications such as self-update, erase firmware ├── lib # Sources from 3rd party such as tinyusb, mcu drivers ... ├── ports # Port/family specific sources -│   ├── esp32s2 +│   ├── espressif │   │   └── boards/ # Board specific sources │   │   └── Makefile # Makefile for this port │   └── mimxrt10xx @@ -20,7 +20,7 @@ This repo is cross-platform UF2 Bootloader projects for MCUs based on [TinyUSB]( TODO more docs later -- Support ESP32-S2, iMXRT10xx, LPC55xx, STM32F3, STM32F4 +- Support ESP32-S2, ESP32-S3, iMXRT10xx, LPC55xx, STM32F3, STM32F4 - Self update with update file in uf2 format - Indicator: LED, RGB - Debug log with uart/swd diff --git a/ports/esp32s2/CMakeLists.txt b/ports/espressif/CMakeLists.txt similarity index 100% rename from ports/esp32s2/CMakeLists.txt rename to ports/espressif/CMakeLists.txt diff --git a/ports/esp32s2/Makefile b/ports/espressif/Makefile similarity index 100% rename from ports/esp32s2/Makefile rename to ports/espressif/Makefile diff --git a/ports/esp32s2/README.md b/ports/espressif/README.md similarity index 100% rename from ports/esp32s2/README.md rename to ports/espressif/README.md diff --git a/ports/esp32s2/apps/self_update/CMakeLists.txt b/ports/espressif/apps/self_update/CMakeLists.txt similarity index 100% rename from ports/esp32s2/apps/self_update/CMakeLists.txt rename to ports/espressif/apps/self_update/CMakeLists.txt diff --git a/ports/esp32s2/apps/self_update/sdkconfig.defaults b/ports/espressif/apps/self_update/sdkconfig.defaults similarity index 100% rename from ports/esp32s2/apps/self_update/sdkconfig.defaults rename to ports/espressif/apps/self_update/sdkconfig.defaults diff --git a/ports/esp32s2/boards/CMakeLists.txt b/ports/espressif/boards/CMakeLists.txt similarity index 94% rename from ports/esp32s2/boards/CMakeLists.txt rename to ports/espressif/boards/CMakeLists.txt index 923c1e389..dbe342eca 100644 --- a/ports/esp32s2/boards/CMakeLists.txt +++ b/ports/espressif/boards/CMakeLists.txt @@ -9,5 +9,5 @@ target_include_directories(${COMPONENT_TARGET} PUBLIC "${FREERTOS_ORIG_INCLUDE_PATH}" "${TOP}/src" "${TOP}/lib/tinyusb/src" - "${TOP}/ports/esp32s2" + "${TOP}/ports/espressif" ) \ No newline at end of file diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2/board.cmake b/ports/espressif/boards/adafruit_feather_esp32s2/board.cmake similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2/board.cmake rename to ports/espressif/boards/adafruit_feather_esp32s2/board.cmake diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2/board.h b/ports/espressif/boards/adafruit_feather_esp32s2/board.h similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2/board.h rename to ports/espressif/boards/adafruit_feather_esp32s2/board.h diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2/sdkconfig rename to ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_reverse_tft/board.cmake b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.cmake similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_reverse_tft/board.cmake rename to ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.cmake diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_reverse_tft/board.h b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.h similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_reverse_tft/board.h rename to ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.h diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig rename to ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tft/board.cmake b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.cmake similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tft/board.cmake rename to ports/espressif/boards/adafruit_feather_esp32s2_tft/board.cmake diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tft/board.h b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.h similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tft/board.h rename to ports/espressif/boards/adafruit_feather_esp32s2_tft/board.h diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tft/sdkconfig rename to ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_funhouse_esp32s2/board.cmake b/ports/espressif/boards/adafruit_funhouse_esp32s2/board.cmake similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse_esp32s2/board.cmake rename to ports/espressif/boards/adafruit_funhouse_esp32s2/board.cmake diff --git a/ports/esp32s2/boards/adafruit_funhouse_esp32s2/board.h b/ports/espressif/boards/adafruit_funhouse_esp32s2/board.h similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse_esp32s2/board.h rename to ports/espressif/boards/adafruit_funhouse_esp32s2/board.h diff --git a/ports/esp32s2/boards/adafruit_funhouse_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_funhouse_esp32s2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse_esp32s2/sdkconfig rename to ports/espressif/boards/adafruit_funhouse_esp32s2/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_magtag_29gray/board.cmake b/ports/espressif/boards/adafruit_magtag_29gray/board.cmake similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_29gray/board.cmake rename to ports/espressif/boards/adafruit_magtag_29gray/board.cmake diff --git a/ports/esp32s2/boards/adafruit_magtag_29gray/board.h b/ports/espressif/boards/adafruit_magtag_29gray/board.h similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_29gray/board.h rename to ports/espressif/boards/adafruit_magtag_29gray/board.h diff --git a/ports/esp32s2/boards/adafruit_magtag_29gray/sdkconfig b/ports/espressif/boards/adafruit_magtag_29gray/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_29gray/sdkconfig rename to ports/espressif/boards/adafruit_magtag_29gray/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/board.cmake b/ports/espressif/boards/adafruit_metro_esp32s2/board.cmake similarity index 100% rename from ports/esp32s2/boards/adafruit_metro_esp32s2/board.cmake rename to ports/espressif/boards/adafruit_metro_esp32s2/board.cmake diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/board.h b/ports/espressif/boards/adafruit_metro_esp32s2/board.h similarity index 100% rename from ports/esp32s2/boards/adafruit_metro_esp32s2/board.h rename to ports/espressif/boards/adafruit_metro_esp32s2/board.h diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig rename to ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_qtpy_esp32s2/board.cmake b/ports/espressif/boards/adafruit_qtpy_esp32s2/board.cmake similarity index 100% rename from ports/esp32s2/boards/adafruit_qtpy_esp32s2/board.cmake rename to ports/espressif/boards/adafruit_qtpy_esp32s2/board.cmake diff --git a/ports/esp32s2/boards/adafruit_qtpy_esp32s2/board.h b/ports/espressif/boards/adafruit_qtpy_esp32s2/board.h similarity index 100% rename from ports/esp32s2/boards/adafruit_qtpy_esp32s2/board.h rename to ports/espressif/boards/adafruit_qtpy_esp32s2/board.h diff --git a/ports/esp32s2/boards/adafruit_qtpy_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_qtpy_esp32s2/sdkconfig rename to ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig diff --git a/ports/esp32s2/boards/artisense_rd00/board.cmake b/ports/espressif/boards/artisense_rd00/board.cmake similarity index 100% rename from ports/esp32s2/boards/artisense_rd00/board.cmake rename to ports/espressif/boards/artisense_rd00/board.cmake diff --git a/ports/esp32s2/boards/artisense_rd00/board.h b/ports/espressif/boards/artisense_rd00/board.h similarity index 100% rename from ports/esp32s2/boards/artisense_rd00/board.h rename to ports/espressif/boards/artisense_rd00/board.h diff --git a/ports/esp32s2/boards/artisense_rd00/sdkconfig b/ports/espressif/boards/artisense_rd00/sdkconfig similarity index 100% rename from ports/esp32s2/boards/artisense_rd00/sdkconfig rename to ports/espressif/boards/artisense_rd00/sdkconfig diff --git a/ports/esp32s2/boards/atmegazero_esp32s2/board.cmake b/ports/espressif/boards/atmegazero_esp32s2/board.cmake similarity index 100% rename from ports/esp32s2/boards/atmegazero_esp32s2/board.cmake rename to ports/espressif/boards/atmegazero_esp32s2/board.cmake diff --git a/ports/esp32s2/boards/atmegazero_esp32s2/board.h b/ports/espressif/boards/atmegazero_esp32s2/board.h similarity index 100% rename from ports/esp32s2/boards/atmegazero_esp32s2/board.h rename to ports/espressif/boards/atmegazero_esp32s2/board.h diff --git a/ports/esp32s2/boards/atmegazero_esp32s2/sdkconfig b/ports/espressif/boards/atmegazero_esp32s2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/atmegazero_esp32s2/sdkconfig rename to ports/espressif/boards/atmegazero_esp32s2/sdkconfig diff --git a/ports/esp32s2/boards/board_flash.c b/ports/espressif/boards/board_flash.c similarity index 100% rename from ports/esp32s2/boards/board_flash.c rename to ports/espressif/boards/board_flash.c diff --git a/ports/esp32s2/boards/boards.c b/ports/espressif/boards/boards.c similarity index 100% rename from ports/esp32s2/boards/boards.c rename to ports/espressif/boards/boards.c diff --git a/ports/esp32s2/boards/boards.h b/ports/espressif/boards/boards.h similarity index 100% rename from ports/esp32s2/boards/boards.h rename to ports/espressif/boards/boards.h diff --git a/ports/esp32s2/boards/espressif_esp32s3_devkitc_1/board.cmake b/ports/espressif/boards/espressif_esp32s3_devkitc_1/board.cmake similarity index 100% rename from ports/esp32s2/boards/espressif_esp32s3_devkitc_1/board.cmake rename to ports/espressif/boards/espressif_esp32s3_devkitc_1/board.cmake diff --git a/ports/esp32s2/boards/espressif_esp32s3_devkitc_1/board.h b/ports/espressif/boards/espressif_esp32s3_devkitc_1/board.h similarity index 100% rename from ports/esp32s2/boards/espressif_esp32s3_devkitc_1/board.h rename to ports/espressif/boards/espressif_esp32s3_devkitc_1/board.h diff --git a/ports/esp32s2/boards/espressif_esp32s3_devkitc_1/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_esp32s3_devkitc_1/sdkconfig rename to ports/espressif/boards/espressif_esp32s3_devkitc_1/sdkconfig diff --git a/ports/esp32s2/boards/espressif_esp32s3_devkitm_1/board.cmake b/ports/espressif/boards/espressif_esp32s3_devkitm_1/board.cmake similarity index 100% rename from ports/esp32s2/boards/espressif_esp32s3_devkitm_1/board.cmake rename to ports/espressif/boards/espressif_esp32s3_devkitm_1/board.cmake diff --git a/ports/esp32s2/boards/espressif_esp32s3_devkitm_1/board.h b/ports/espressif/boards/espressif_esp32s3_devkitm_1/board.h similarity index 100% rename from ports/esp32s2/boards/espressif_esp32s3_devkitm_1/board.h rename to ports/espressif/boards/espressif_esp32s3_devkitm_1/board.h diff --git a/ports/esp32s2/boards/espressif_esp32s3_devkitm_1/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitm_1/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_esp32s3_devkitm_1/sdkconfig rename to ports/espressif/boards/espressif_esp32s3_devkitm_1/sdkconfig diff --git a/ports/esp32s2/boards/espressif_hmi_1/board.cmake b/ports/espressif/boards/espressif_hmi_1/board.cmake similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_1/board.cmake rename to ports/espressif/boards/espressif_hmi_1/board.cmake diff --git a/ports/esp32s2/boards/espressif_hmi_1/board.h b/ports/espressif/boards/espressif_hmi_1/board.h similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_1/board.h rename to ports/espressif/boards/espressif_hmi_1/board.h diff --git a/ports/esp32s2/boards/espressif_hmi_1/sdkconfig b/ports/espressif/boards/espressif_hmi_1/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_1/sdkconfig rename to ports/espressif/boards/espressif_hmi_1/sdkconfig diff --git a/ports/esp32s2/boards/espressif_kaluga_1/board.cmake b/ports/espressif/boards/espressif_kaluga_1/board.cmake similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1/board.cmake rename to ports/espressif/boards/espressif_kaluga_1/board.cmake diff --git a/ports/esp32s2/boards/espressif_kaluga_1/board.h b/ports/espressif/boards/espressif_kaluga_1/board.h similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1/board.h rename to ports/espressif/boards/espressif_kaluga_1/board.h diff --git a/ports/esp32s2/boards/espressif_kaluga_1/sdkconfig b/ports/espressif/boards/espressif_kaluga_1/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1/sdkconfig rename to ports/espressif/boards/espressif_kaluga_1/sdkconfig diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/board.cmake b/ports/espressif/boards/espressif_saola_1_wroom/board.cmake similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wroom/board.cmake rename to ports/espressif/boards/espressif_saola_1_wroom/board.cmake diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/board.h b/ports/espressif/boards/espressif_saola_1_wroom/board.h similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wroom/board.h rename to ports/espressif/boards/espressif_saola_1_wroom/board.h diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/sdkconfig b/ports/espressif/boards/espressif_saola_1_wroom/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wroom/sdkconfig rename to ports/espressif/boards/espressif_saola_1_wroom/sdkconfig diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/board.cmake b/ports/espressif/boards/espressif_saola_1_wrover/board.cmake similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wrover/board.cmake rename to ports/espressif/boards/espressif_saola_1_wrover/board.cmake diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/board.h b/ports/espressif/boards/espressif_saola_1_wrover/board.h similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wrover/board.h rename to ports/espressif/boards/espressif_saola_1_wrover/board.h diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/sdkconfig b/ports/espressif/boards/espressif_saola_1_wrover/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wrover/sdkconfig rename to ports/espressif/boards/espressif_saola_1_wrover/sdkconfig diff --git a/ports/esp32s2/boards/gravitech_cucumberRIS_v1.1/board.cmake b/ports/espressif/boards/gravitech_cucumberRIS_v1.1/board.cmake similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumberRIS_v1.1/board.cmake rename to ports/espressif/boards/gravitech_cucumberRIS_v1.1/board.cmake diff --git a/ports/esp32s2/boards/gravitech_cucumberRIS_v1.1/board.h b/ports/espressif/boards/gravitech_cucumberRIS_v1.1/board.h similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumberRIS_v1.1/board.h rename to ports/espressif/boards/gravitech_cucumberRIS_v1.1/board.h diff --git a/ports/esp32s2/boards/gravitech_cucumberRIS_v1.1/sdkconfig b/ports/espressif/boards/gravitech_cucumberRIS_v1.1/sdkconfig similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumberRIS_v1.1/sdkconfig rename to ports/espressif/boards/gravitech_cucumberRIS_v1.1/sdkconfig diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/board.cmake b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.cmake similarity index 100% rename from ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/board.cmake rename to ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.cmake diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/board.h b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.h similarity index 100% rename from ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/board.h rename to ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.h diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig similarity index 100% rename from ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig rename to ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig diff --git a/ports/esp32s2/boards/lolin_s2-pico/board.cmake b/ports/espressif/boards/lolin_s2-pico/board.cmake similarity index 100% rename from ports/esp32s2/boards/lolin_s2-pico/board.cmake rename to ports/espressif/boards/lolin_s2-pico/board.cmake diff --git a/ports/esp32s2/boards/lolin_s2-pico/board.h b/ports/espressif/boards/lolin_s2-pico/board.h similarity index 100% rename from ports/esp32s2/boards/lolin_s2-pico/board.h rename to ports/espressif/boards/lolin_s2-pico/board.h diff --git a/ports/esp32s2/boards/lolin_s2-pico/sdkconfig b/ports/espressif/boards/lolin_s2-pico/sdkconfig similarity index 100% rename from ports/esp32s2/boards/lolin_s2-pico/sdkconfig rename to ports/espressif/boards/lolin_s2-pico/sdkconfig diff --git a/ports/esp32s2/boards/lolin_s2_mini/board.cmake b/ports/espressif/boards/lolin_s2_mini/board.cmake similarity index 100% rename from ports/esp32s2/boards/lolin_s2_mini/board.cmake rename to ports/espressif/boards/lolin_s2_mini/board.cmake diff --git a/ports/esp32s2/boards/lolin_s2_mini/board.h b/ports/espressif/boards/lolin_s2_mini/board.h similarity index 100% rename from ports/esp32s2/boards/lolin_s2_mini/board.h rename to ports/espressif/boards/lolin_s2_mini/board.h diff --git a/ports/esp32s2/boards/lolin_s2_mini/sdkconfig b/ports/espressif/boards/lolin_s2_mini/sdkconfig similarity index 100% rename from ports/esp32s2/boards/lolin_s2_mini/sdkconfig rename to ports/espressif/boards/lolin_s2_mini/sdkconfig diff --git a/ports/esp32s2/boards/microdev_micro_s2/board.cmake b/ports/espressif/boards/microdev_micro_s2/board.cmake similarity index 100% rename from ports/esp32s2/boards/microdev_micro_s2/board.cmake rename to ports/espressif/boards/microdev_micro_s2/board.cmake diff --git a/ports/esp32s2/boards/microdev_micro_s2/board.h b/ports/espressif/boards/microdev_micro_s2/board.h similarity index 100% rename from ports/esp32s2/boards/microdev_micro_s2/board.h rename to ports/espressif/boards/microdev_micro_s2/board.h diff --git a/ports/esp32s2/boards/microdev_micro_s2/sdkconfig b/ports/espressif/boards/microdev_micro_s2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/microdev_micro_s2/sdkconfig rename to ports/espressif/boards/microdev_micro_s2/sdkconfig diff --git a/ports/esp32s2/boards/morpheans_morphesp-240/board.cmake b/ports/espressif/boards/morpheans_morphesp-240/board.cmake similarity index 100% rename from ports/esp32s2/boards/morpheans_morphesp-240/board.cmake rename to ports/espressif/boards/morpheans_morphesp-240/board.cmake diff --git a/ports/esp32s2/boards/morpheans_morphesp-240/board.h b/ports/espressif/boards/morpheans_morphesp-240/board.h similarity index 100% rename from ports/esp32s2/boards/morpheans_morphesp-240/board.h rename to ports/espressif/boards/morpheans_morphesp-240/board.h diff --git a/ports/esp32s2/boards/morpheans_morphesp-240/sdkconfig b/ports/espressif/boards/morpheans_morphesp-240/sdkconfig similarity index 100% rename from ports/esp32s2/boards/morpheans_morphesp-240/sdkconfig rename to ports/espressif/boards/morpheans_morphesp-240/sdkconfig diff --git a/ports/esp32s2/boards/muselab_nanoesp32-s2_wroom/board.cmake b/ports/espressif/boards/muselab_nanoesp32-s2_wroom/board.cmake similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32-s2_wroom/board.cmake rename to ports/espressif/boards/muselab_nanoesp32-s2_wroom/board.cmake diff --git a/ports/esp32s2/boards/muselab_nanoesp32-s2_wroom/board.h b/ports/espressif/boards/muselab_nanoesp32-s2_wroom/board.h similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32-s2_wroom/board.h rename to ports/espressif/boards/muselab_nanoesp32-s2_wroom/board.h diff --git a/ports/esp32s2/boards/muselab_nanoesp32-s2_wroom/sdkconfig b/ports/espressif/boards/muselab_nanoesp32-s2_wroom/sdkconfig similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32-s2_wroom/sdkconfig rename to ports/espressif/boards/muselab_nanoesp32-s2_wroom/sdkconfig diff --git a/ports/esp32s2/boards/muselab_nanoesp32-s2_wrover/board.cmake b/ports/espressif/boards/muselab_nanoesp32-s2_wrover/board.cmake similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32-s2_wrover/board.cmake rename to ports/espressif/boards/muselab_nanoesp32-s2_wrover/board.cmake diff --git a/ports/esp32s2/boards/muselab_nanoesp32-s2_wrover/board.h b/ports/espressif/boards/muselab_nanoesp32-s2_wrover/board.h similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32-s2_wrover/board.h rename to ports/espressif/boards/muselab_nanoesp32-s2_wrover/board.h diff --git a/ports/esp32s2/boards/muselab_nanoesp32-s2_wrover/sdkconfig b/ports/espressif/boards/muselab_nanoesp32-s2_wrover/sdkconfig similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32-s2_wrover/sdkconfig rename to ports/espressif/boards/muselab_nanoesp32-s2_wrover/sdkconfig diff --git a/ports/esp32s2/boards/olimex_esp32s2_devkit_lipo_vB1/board.cmake b/ports/espressif/boards/olimex_esp32s2_devkit_lipo_vB1/board.cmake similarity index 100% rename from ports/esp32s2/boards/olimex_esp32s2_devkit_lipo_vB1/board.cmake rename to ports/espressif/boards/olimex_esp32s2_devkit_lipo_vB1/board.cmake diff --git a/ports/esp32s2/boards/olimex_esp32s2_devkit_lipo_vB1/board.h b/ports/espressif/boards/olimex_esp32s2_devkit_lipo_vB1/board.h similarity index 100% rename from ports/esp32s2/boards/olimex_esp32s2_devkit_lipo_vB1/board.h rename to ports/espressif/boards/olimex_esp32s2_devkit_lipo_vB1/board.h diff --git a/ports/esp32s2/boards/olimex_esp32s2_devkit_lipo_vB1/sdkconfig b/ports/espressif/boards/olimex_esp32s2_devkit_lipo_vB1/sdkconfig similarity index 100% rename from ports/esp32s2/boards/olimex_esp32s2_devkit_lipo_vB1/sdkconfig rename to ports/espressif/boards/olimex_esp32s2_devkit_lipo_vB1/sdkconfig diff --git a/ports/esp32s2/boards/targett_mcb_wroom/board.cmake b/ports/espressif/boards/targett_mcb_wroom/board.cmake similarity index 100% rename from ports/esp32s2/boards/targett_mcb_wroom/board.cmake rename to ports/espressif/boards/targett_mcb_wroom/board.cmake diff --git a/ports/esp32s2/boards/targett_mcb_wroom/board.h b/ports/espressif/boards/targett_mcb_wroom/board.h similarity index 100% rename from ports/esp32s2/boards/targett_mcb_wroom/board.h rename to ports/espressif/boards/targett_mcb_wroom/board.h diff --git a/ports/esp32s2/boards/targett_mcb_wroom/sdkconfig b/ports/espressif/boards/targett_mcb_wroom/sdkconfig similarity index 100% rename from ports/esp32s2/boards/targett_mcb_wroom/sdkconfig rename to ports/espressif/boards/targett_mcb_wroom/sdkconfig diff --git a/ports/esp32s2/boards/targett_mcb_wrover/board.cmake b/ports/espressif/boards/targett_mcb_wrover/board.cmake similarity index 100% rename from ports/esp32s2/boards/targett_mcb_wrover/board.cmake rename to ports/espressif/boards/targett_mcb_wrover/board.cmake diff --git a/ports/esp32s2/boards/targett_mcb_wrover/board.h b/ports/espressif/boards/targett_mcb_wrover/board.h similarity index 100% rename from ports/esp32s2/boards/targett_mcb_wrover/board.h rename to ports/espressif/boards/targett_mcb_wrover/board.h diff --git a/ports/esp32s2/boards/targett_mcb_wrover/sdkconfig b/ports/espressif/boards/targett_mcb_wrover/sdkconfig similarity index 100% rename from ports/esp32s2/boards/targett_mcb_wrover/sdkconfig rename to ports/espressif/boards/targett_mcb_wrover/sdkconfig diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/board.cmake b/ports/espressif/boards/unexpectedmaker_feathers2/board.cmake similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2/board.cmake rename to ports/espressif/boards/unexpectedmaker_feathers2/board.cmake diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/board.h b/ports/espressif/boards/unexpectedmaker_feathers2/board.h similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2/board.h rename to ports/espressif/boards/unexpectedmaker_feathers2/board.h diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig b/ports/espressif/boards/unexpectedmaker_feathers2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig rename to ports/espressif/boards/unexpectedmaker_feathers2/sdkconfig diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_neo/board.cmake b/ports/espressif/boards/unexpectedmaker_feathers2_neo/board.cmake similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_neo/board.cmake rename to ports/espressif/boards/unexpectedmaker_feathers2_neo/board.cmake diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_neo/board.h b/ports/espressif/boards/unexpectedmaker_feathers2_neo/board.h similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_neo/board.h rename to ports/espressif/boards/unexpectedmaker_feathers2_neo/board.h diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_neo/sdkconfig b/ports/espressif/boards/unexpectedmaker_feathers2_neo/sdkconfig similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_neo/sdkconfig rename to ports/espressif/boards/unexpectedmaker_feathers2_neo/sdkconfig diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/board.cmake b/ports/espressif/boards/unexpectedmaker_tinys2/board.cmake similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_tinys2/board.cmake rename to ports/espressif/boards/unexpectedmaker_tinys2/board.cmake diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/board.h b/ports/espressif/boards/unexpectedmaker_tinys2/board.h similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_tinys2/board.h rename to ports/espressif/boards/unexpectedmaker_tinys2/board.h diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/sdkconfig b/ports/espressif/boards/unexpectedmaker_tinys2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_tinys2/sdkconfig rename to ports/espressif/boards/unexpectedmaker_tinys2/sdkconfig diff --git a/ports/esp32s2/components/bootloader/CMakeLists.txt b/ports/espressif/components/bootloader/CMakeLists.txt similarity index 100% rename from ports/esp32s2/components/bootloader/CMakeLists.txt rename to ports/espressif/components/bootloader/CMakeLists.txt diff --git a/ports/esp32s2/components/bootloader/Kconfig.projbuild b/ports/espressif/components/bootloader/Kconfig.projbuild similarity index 100% rename from ports/esp32s2/components/bootloader/Kconfig.projbuild rename to ports/espressif/components/bootloader/Kconfig.projbuild diff --git a/ports/esp32s2/components/bootloader/Makefile.projbuild b/ports/espressif/components/bootloader/Makefile.projbuild similarity index 100% rename from ports/esp32s2/components/bootloader/Makefile.projbuild rename to ports/espressif/components/bootloader/Makefile.projbuild diff --git a/ports/esp32s2/components/bootloader/component.mk b/ports/espressif/components/bootloader/component.mk similarity index 100% rename from ports/esp32s2/components/bootloader/component.mk rename to ports/espressif/components/bootloader/component.mk diff --git a/ports/esp32s2/components/bootloader/project_include.cmake b/ports/espressif/components/bootloader/project_include.cmake similarity index 100% rename from ports/esp32s2/components/bootloader/project_include.cmake rename to ports/espressif/components/bootloader/project_include.cmake diff --git a/ports/esp32s2/components/bootloader/sdkconfig.rename b/ports/espressif/components/bootloader/sdkconfig.rename similarity index 100% rename from ports/esp32s2/components/bootloader/sdkconfig.rename rename to ports/espressif/components/bootloader/sdkconfig.rename diff --git a/ports/esp32s2/components/bootloader/subproject/.gitignore b/ports/espressif/components/bootloader/subproject/.gitignore similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/.gitignore rename to ports/espressif/components/bootloader/subproject/.gitignore diff --git a/ports/esp32s2/components/bootloader/subproject/CMakeLists.txt b/ports/espressif/components/bootloader/subproject/CMakeLists.txt similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/CMakeLists.txt rename to ports/espressif/components/bootloader/subproject/CMakeLists.txt diff --git a/ports/esp32s2/components/bootloader/subproject/Makefile b/ports/espressif/components/bootloader/subproject/Makefile similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/Makefile rename to ports/espressif/components/bootloader/subproject/Makefile diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/CMakeLists.txt b/ports/espressif/components/bootloader/subproject/components/micro-ecc/CMakeLists.txt similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/CMakeLists.txt rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/CMakeLists.txt diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/component.mk b/ports/espressif/components/bootloader/subproject/components/micro-ecc/component.mk similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/component.mk rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/component.mk diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/.gitignore b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/.gitignore similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/.gitignore rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/.gitignore diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/LICENSE.txt b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/LICENSE.txt similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/LICENSE.txt rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/LICENSE.txt diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/README.md b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/README.md similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/README.md rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/README.md diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm.inc b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm.inc similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm.inc rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm.inc diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square.inc b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square.inc similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square.inc rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square.inc diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square_umaal.inc b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square_umaal.inc similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square_umaal.inc rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_arm_mult_square_umaal.inc diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr.inc b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr.inc similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr.inc rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr.inc diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr_mult_square.inc b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr_mult_square.inc similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr_mult_square.inc rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/asm_avr_mult_square.inc diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/curve-specific.inc b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/curve-specific.inc similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/curve-specific.inc rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/curve-specific.inc diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_project.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_project.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_project.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_project.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_rules.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_rules.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_rules.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/emk_rules.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/examples/ecc_test/ecc_test.ino b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/examples/ecc_test/ecc_test.ino similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/examples/ecc_test/ecc_test.ino rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/examples/ecc_test/ecc_test.ino diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/library.properties b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/library.properties similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/library.properties rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/library.properties diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/platform-specific.inc b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/platform-specific.inc similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/platform-specific.inc rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/platform-specific.inc diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_arm.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_arm.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_arm.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_arm.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr_extra.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr_extra.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr_extra.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/mult_avr_extra.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_arm.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_arm.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_arm.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_arm.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_avr.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_avr.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_avr.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/scripts/square_avr.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/emk_rules.py b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/emk_rules.py similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/emk_rules.py rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/emk_rules.py diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compress.c b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compress.c similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compress.c rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compress.c diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compute.c b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compute.c similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compute.c rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_compute.c diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdh.c b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdh.c similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdh.c rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdh.c diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa.c b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa.c similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa.c rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa.c diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa_deterministic.c.example b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa_deterministic.c.example similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa_deterministic.c.example rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/test/test_ecdsa_deterministic.c.example diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/types.h b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/types.h similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/types.h rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/types.h diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.c b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.c similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.c rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.c diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.h b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.h similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.h rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC.h diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC_vli.h b/ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC_vli.h similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC_vli.h rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/micro-ecc/uECC_vli.h diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.c b/ports/espressif/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.c similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.c rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.c diff --git a/ports/esp32s2/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.h b/ports/espressif/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.h similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.h rename to ports/espressif/components/bootloader/subproject/components/micro-ecc/uECC_verify_antifault.h diff --git a/ports/esp32s2/components/bootloader/subproject/main/CMakeLists.txt b/ports/espressif/components/bootloader/subproject/main/CMakeLists.txt similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/CMakeLists.txt rename to ports/espressif/components/bootloader/subproject/main/CMakeLists.txt diff --git a/ports/esp32s2/components/bootloader/subproject/main/bootloader_hooks.h b/ports/espressif/components/bootloader/subproject/main/bootloader_hooks.h similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/bootloader_hooks.h rename to ports/espressif/components/bootloader/subproject/main/bootloader_hooks.h diff --git a/ports/esp32s2/components/bootloader/subproject/main/bootloader_start.c b/ports/espressif/components/bootloader/subproject/main/bootloader_start.c similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/bootloader_start.c rename to ports/espressif/components/bootloader/subproject/main/bootloader_start.c diff --git a/ports/esp32s2/components/bootloader/subproject/main/component.mk b/ports/espressif/components/bootloader/subproject/main/component.mk similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/component.mk rename to ports/espressif/components/bootloader/subproject/main/component.mk diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32/bootloader.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32/bootloader.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32/bootloader.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32/bootloader.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32/bootloader.rom.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32/bootloader.rom.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32/bootloader.rom.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32/bootloader.rom.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32c3/bootloader.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32c3/bootloader.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32c3/bootloader.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32c3/bootloader.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32c3/bootloader.rom.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32c3/bootloader.rom.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32c3/bootloader.rom.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32c3/bootloader.rom.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32h2/bootloader.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32h2/bootloader.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32h2/bootloader.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32h2/bootloader.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32s2/bootloader.rom.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32s2/bootloader.rom.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32s2/bootloader.rom.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32s2/bootloader.rom.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld diff --git a/ports/esp32s2/components/bootloader/subproject/main/ld/esp32s3/bootloader.rom.ld b/ports/espressif/components/bootloader/subproject/main/ld/esp32s3/bootloader.rom.ld similarity index 100% rename from ports/esp32s2/components/bootloader/subproject/main/ld/esp32s3/bootloader.rom.ld rename to ports/espressif/components/bootloader/subproject/main/ld/esp32s3/bootloader.rom.ld diff --git a/ports/esp32s2/components/lcd/CMakeLists.txt b/ports/espressif/components/lcd/CMakeLists.txt similarity index 100% rename from ports/esp32s2/components/lcd/CMakeLists.txt rename to ports/espressif/components/lcd/CMakeLists.txt diff --git a/ports/esp32s2/components/lcd/include/lcd.h b/ports/espressif/components/lcd/include/lcd.h similarity index 100% rename from ports/esp32s2/components/lcd/include/lcd.h rename to ports/espressif/components/lcd/include/lcd.h diff --git a/ports/esp32s2/components/lcd/lcd.c b/ports/espressif/components/lcd/lcd.c similarity index 100% rename from ports/esp32s2/components/lcd/lcd.c rename to ports/espressif/components/lcd/lcd.c diff --git a/ports/esp32s2/components/led_strip/CMakeLists.txt b/ports/espressif/components/led_strip/CMakeLists.txt similarity index 100% rename from ports/esp32s2/components/led_strip/CMakeLists.txt rename to ports/espressif/components/led_strip/CMakeLists.txt diff --git a/ports/esp32s2/components/led_strip/include/led_strip.h b/ports/espressif/components/led_strip/include/led_strip.h similarity index 100% rename from ports/esp32s2/components/led_strip/include/led_strip.h rename to ports/espressif/components/led_strip/include/led_strip.h diff --git a/ports/esp32s2/components/led_strip/src/led_strip_rmt_ws2812.c b/ports/espressif/components/led_strip/src/led_strip_rmt_ws2812.c similarity index 100% rename from ports/esp32s2/components/led_strip/src/led_strip_rmt_ws2812.c rename to ports/espressif/components/led_strip/src/led_strip_rmt_ws2812.c diff --git a/ports/esp32s2/partitions-16MB.csv b/ports/espressif/partitions-16MB.csv similarity index 100% rename from ports/esp32s2/partitions-16MB.csv rename to ports/espressif/partitions-16MB.csv diff --git a/ports/esp32s2/partitions-4MB.csv b/ports/espressif/partitions-4MB.csv similarity index 100% rename from ports/esp32s2/partitions-4MB.csv rename to ports/espressif/partitions-4MB.csv diff --git a/ports/esp32s2/partitions-8MB.csv b/ports/espressif/partitions-8MB.csv similarity index 100% rename from ports/esp32s2/partitions-8MB.csv rename to ports/espressif/partitions-8MB.csv diff --git a/ports/esp32s2/sdkconfig.defaults b/ports/espressif/sdkconfig.defaults similarity index 100% rename from ports/esp32s2/sdkconfig.defaults rename to ports/espressif/sdkconfig.defaults diff --git a/ports/esp32s2/tusb_config.h b/ports/espressif/tusb_config.h similarity index 100% rename from ports/esp32s2/tusb_config.h rename to ports/espressif/tusb_config.h