From 973a90f2aac4dd3b61d5b1c1aa6f3b3680c01db5 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 13 Sep 2021 16:44:55 -0700 Subject: [PATCH] Rename esp32s2 port to espressif This is in preparation for ESP32-S3 support and potentially others. Related to #4363 --- .github/workflows/build.yml | 18 +- .github/workflows/ports_windows.yml | 4 +- .gitmodules | 4 +- Makefile | 14 +- README.rst | 2 +- WEBUSB_README.md | 2 +- conf.py | 8 +- docs/shared_bindings_matrix.py | 2 +- docs/supported_ports.rst | 2 +- locale/circuitpython.pot | 263 ++++---- ports/{esp32s2 => espressif}/.gitignore | 0 ports/{esp32s2 => espressif}/CMakeLists.txt | 0 ports/{esp32s2 => espressif}/Makefile | 0 ports/{esp32s2 => espressif}/README.rst | 0 ports/{esp32s2 => espressif}/background.c | 0 ports/{esp32s2 => espressif}/background.h | 0 .../bindings/espidf/__init__.c | 0 .../bindings/espidf/__init__.h | 0 .../adafruit_feather_esp32s2_nopsram/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../adafruit_feather_esp32s2_nopsram/pins.c | 0 .../sdkconfig | 0 .../board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../pins.c | 0 .../sdkconfig | 0 .../boards/adafruit_funhouse/board.c | 0 .../boards/adafruit_funhouse/mpconfigboard.h | 0 .../boards/adafruit_funhouse/mpconfigboard.mk | 0 .../boards/adafruit_funhouse/pins.c | 0 .../boards/adafruit_funhouse/sdkconfig | 0 .../adafruit_magtag_2.9_grayscale/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../adafruit_magtag_2.9_grayscale/pins.c | 0 .../adafruit_magtag_2.9_grayscale/sdkconfig | 0 .../boards/adafruit_metro_esp32s2/board.c | 0 .../adafruit_metro_esp32s2/mpconfigboard.h | 0 .../adafruit_metro_esp32s2/mpconfigboard.mk | 0 .../boards/adafruit_metro_esp32s2/pins.c | 0 .../boards/adafruit_metro_esp32s2/sdkconfig | 0 .../boards/ai_thinker_esp_12k_nodemcu/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../boards/ai_thinker_esp_12k_nodemcu/pins.c | 0 .../ai_thinker_esp_12k_nodemcu/sdkconfig | 0 .../boards/artisense_rd00/board.c | 0 .../boards/artisense_rd00/mpconfigboard.h | 0 .../boards/artisense_rd00/mpconfigboard.mk | 0 .../boards/artisense_rd00/pins.c | 0 .../boards/artisense_rd00/sdkconfig | 0 .../boards/atmegazero_esp32s2/board.c | 0 .../boards/atmegazero_esp32s2/mpconfigboard.h | 0 .../atmegazero_esp32s2/mpconfigboard.mk | 0 .../boards/atmegazero_esp32s2/pins.c | 0 .../boards/atmegazero_esp32s2/sdkconfig | 0 .../boards/crumpspace_crumps2/board.c | 0 .../boards/crumpspace_crumps2/mpconfigboard.h | 0 .../crumpspace_crumps2/mpconfigboard.mk | 0 .../boards/crumpspace_crumps2/pins.c | 0 .../boards/crumpspace_crumps2/sdkconfig | 0 .../boards/electroniccats_bastwifi/board.c | 0 .../electroniccats_bastwifi/mpconfigboard.h | 0 .../electroniccats_bastwifi/mpconfigboard.mk | 0 .../boards/electroniccats_bastwifi/pins.c | 0 .../boards/electroniccats_bastwifi/sdkconfig | 0 .../boards/espressif_hmi_devkit_1/board.c | 0 .../espressif_hmi_devkit_1/mpconfigboard.h | 0 .../espressif_hmi_devkit_1/mpconfigboard.mk | 0 .../boards/espressif_hmi_devkit_1/pins.c | 0 .../boards/espressif_hmi_devkit_1/sdkconfig | 0 .../boards/espressif_kaluga_1.3/board.c | 0 .../espressif_kaluga_1.3/mpconfigboard.h | 0 .../espressif_kaluga_1.3/mpconfigboard.mk | 0 .../boards/espressif_kaluga_1.3/pins.c | 0 .../boards/espressif_kaluga_1.3/sdkconfig | 0 .../boards/espressif_kaluga_1/board.c | 0 .../boards/espressif_kaluga_1/mpconfigboard.h | 0 .../espressif_kaluga_1/mpconfigboard.mk | 0 .../boards/espressif_kaluga_1/pins.c | 0 .../boards/espressif_kaluga_1/sdkconfig | 0 .../boards/espressif_saola_1_wroom/board.c | 0 .../espressif_saola_1_wroom/mpconfigboard.h | 0 .../espressif_saola_1_wroom/mpconfigboard.mk | 0 .../boards/espressif_saola_1_wroom/pins.c | 0 .../boards/espressif_saola_1_wroom/sdkconfig | 0 .../boards/espressif_saola_1_wrover/board.c | 0 .../espressif_saola_1_wrover/mpconfigboard.h | 0 .../espressif_saola_1_wrover/mpconfigboard.mk | 0 .../boards/espressif_saola_1_wrover/pins.c | 0 .../boards/espressif_saola_1_wrover/sdkconfig | 0 .../boards/franzininho_wifi_wroom/board.c | 0 .../franzininho_wifi_wroom/mpconfigboard.h | 0 .../franzininho_wifi_wroom/mpconfigboard.mk | 0 .../boards/franzininho_wifi_wroom/pins.c | 0 .../boards/franzininho_wifi_wroom/sdkconfig | 0 .../boards/franzininho_wifi_wrover/board.c | 0 .../franzininho_wifi_wrover/mpconfigboard.h | 0 .../franzininho_wifi_wrover/mpconfigboard.mk | 0 .../boards/franzininho_wifi_wrover/pins.c | 0 .../boards/franzininho_wifi_wrover/sdkconfig | 0 .../boards/gravitech_cucumber_m/board.c | 0 .../gravitech_cucumber_m/mpconfigboard.h | 0 .../gravitech_cucumber_m/mpconfigboard.mk | 0 .../boards/gravitech_cucumber_m/pins.c | 0 .../boards/gravitech_cucumber_m/sdkconfig | 0 .../boards/gravitech_cucumber_ms/board.c | 0 .../gravitech_cucumber_ms/mpconfigboard.h | 0 .../gravitech_cucumber_ms/mpconfigboard.mk | 0 .../boards/gravitech_cucumber_ms/pins.c | 0 .../boards/gravitech_cucumber_ms/sdkconfig | 0 .../boards/gravitech_cucumber_r/board.c | 0 .../gravitech_cucumber_r/mpconfigboard.h | 0 .../gravitech_cucumber_r/mpconfigboard.mk | 0 .../boards/gravitech_cucumber_r/pins.c | 0 .../boards/gravitech_cucumber_r/sdkconfig | 0 .../boards/gravitech_cucumber_rs/board.c | 0 .../gravitech_cucumber_rs/mpconfigboard.h | 0 .../gravitech_cucumber_rs/mpconfigboard.mk | 0 .../boards/gravitech_cucumber_rs/pins.c | 0 .../boards/gravitech_cucumber_rs/sdkconfig | 0 .../boards/lilygo_ttgo_t8_s2_st7789/board.c | 0 .../lilygo_ttgo_t8_s2_st7789/mpconfigboard.h | 0 .../lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk | 0 .../boards/lilygo_ttgo_t8_s2_st7789/pins.c | 0 .../boards/lilygo_ttgo_t8_s2_st7789/sdkconfig | 0 .../boards/lolin_s2_mini/board.c | 0 .../boards/lolin_s2_mini/mpconfigboard.h | 0 .../boards/lolin_s2_mini/mpconfigboard.mk | 0 .../boards/lolin_s2_mini/pins.c | 0 .../boards/lolin_s2_mini/sdkconfig | 0 .../boards/microdev_micro_s2/board.c | 0 .../boards/microdev_micro_s2/mpconfigboard.h | 0 .../boards/microdev_micro_s2/mpconfigboard.mk | 0 .../boards/microdev_micro_s2/pins.c | 0 .../boards/microdev_micro_s2/sdkconfig | 0 .../boards/morpheans_morphesp-240/board.c | 0 .../morpheans_morphesp-240/mpconfigboard.h | 0 .../morpheans_morphesp-240/mpconfigboard.mk | 0 .../boards/morpheans_morphesp-240/pins.c | 0 .../boards/morpheans_morphesp-240/sdkconfig | 0 .../boards/muselab_nanoesp32_s2_wroom/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../boards/muselab_nanoesp32_s2_wroom/pins.c | 0 .../muselab_nanoesp32_s2_wroom/sdkconfig | 0 .../muselab_nanoesp32_s2_wrover/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../boards/muselab_nanoesp32_s2_wrover/pins.c | 0 .../muselab_nanoesp32_s2_wrover/sdkconfig | 0 .../boards/odt_pixelwing_esp32_s2/board.c | 0 .../odt_pixelwing_esp32_s2/mpconfigboard.h | 0 .../odt_pixelwing_esp32_s2/mpconfigboard.mk | 0 .../boards/odt_pixelwing_esp32_s2/pins.c | 0 .../boards/odt_pixelwing_esp32_s2/sdkconfig | 0 .../boards/targett_module_clip_wroom/board.c | 0 .../targett_module_clip_wroom/mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../boards/targett_module_clip_wroom/pins.c | 0 .../targett_module_clip_wroom/sdkconfig | 0 .../boards/targett_module_clip_wrover/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../boards/targett_module_clip_wrover/pins.c | 0 .../targett_module_clip_wrover/sdkconfig | 0 .../boards/unexpectedmaker_feathers2/board.c | 0 .../unexpectedmaker_feathers2/mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../boards/unexpectedmaker_feathers2/pins.c | 0 .../unexpectedmaker_feathers2/sdkconfig | 0 .../unexpectedmaker_feathers2_neo/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../unexpectedmaker_feathers2_neo/pins.c | 0 .../unexpectedmaker_feathers2_neo/sdkconfig | 0 .../board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../pins.c | 0 .../sdkconfig | 0 .../boards/unexpectedmaker_tinys2/board.c | 0 .../unexpectedmaker_tinys2/mpconfigboard.h | 0 .../unexpectedmaker_tinys2/mpconfigboard.mk | 0 .../boards/unexpectedmaker_tinys2/pins.c | 0 .../boards/unexpectedmaker_tinys2/sdkconfig | 0 ports/{esp32s2 => espressif}/cam.c | 0 ports/{esp32s2 => espressif}/cam.h | 0 .../certificates/README.md | 0 .../certificates/nina-fw | 0 .../common-hal/alarm/SleepMemory.c | 0 .../common-hal/alarm/SleepMemory.h | 0 .../common-hal/alarm/__init__.c | 0 .../common-hal/alarm/__init__.h | 0 .../common-hal/alarm/pin/PinAlarm.c | 0 .../common-hal/alarm/pin/PinAlarm.h | 0 .../common-hal/alarm/time/TimeAlarm.c | 0 .../common-hal/alarm/time/TimeAlarm.h | 0 .../common-hal/alarm/touch/TouchAlarm.c | 0 .../common-hal/alarm/touch/TouchAlarm.h | 0 .../common-hal/analogio/AnalogIn.c | 0 .../common-hal/analogio/AnalogIn.h | 0 .../common-hal/analogio/AnalogOut.c | 0 .../common-hal/analogio/AnalogOut.h | 0 .../common-hal/analogio/__init__.c | 0 .../common-hal/audiobusio/I2SOut.c | 0 .../common-hal/audiobusio/I2SOut.h | 0 .../common-hal/audiobusio/PDMIn.c | 0 .../common-hal/audiobusio/PDMIn.h | 0 .../common-hal/audiobusio/__init__.c | 0 .../common-hal/audiobusio/__init__.h | 0 .../common-hal/board/__init__.c | 0 .../common-hal/busio/I2C.c | 0 .../common-hal/busio/I2C.h | 0 .../common-hal/busio/SPI.c | 0 .../common-hal/busio/SPI.h | 0 .../common-hal/busio/UART.c | 0 .../common-hal/busio/UART.h | 0 .../common-hal/busio/__init__.c | 0 .../common-hal/canio/CAN.c | 0 .../common-hal/canio/CAN.h | 0 .../common-hal/canio/Listener.c | 0 .../common-hal/canio/Listener.h | 0 .../common-hal/canio/__init__.c | 0 .../common-hal/canio/__init__.h | 0 .../common-hal/countio/Counter.c | 0 .../common-hal/countio/Counter.h | 0 .../common-hal/countio/__init__.c | 0 .../common-hal/digitalio/DigitalInOut.c | 0 .../common-hal/digitalio/DigitalInOut.h | 0 .../common-hal/digitalio/__init__.c | 0 .../common-hal/dualbank/__init__.c | 0 .../common-hal/dualbank/__init__.h | 0 .../common-hal/frequencyio/FrequencyIn.c | 0 .../common-hal/frequencyio/FrequencyIn.h | 0 .../common-hal/frequencyio/__init__.c | 0 .../imagecapture/ParallelImageCapture.c | 0 .../imagecapture/ParallelImageCapture.h | 0 .../common-hal/imagecapture/__init__.c | 0 .../common-hal/imagecapture/__init__.h | 0 .../common-hal/microcontroller/Pin.c | 0 .../common-hal/microcontroller/Pin.h | 0 .../common-hal/microcontroller/Processor.c | 0 .../common-hal/microcontroller/Processor.h | 0 .../common-hal/microcontroller/__init__.c | 0 .../common-hal/neopixel_write/__init__.c | 0 .../common-hal/nvm/ByteArray.c | 0 .../common-hal/nvm/ByteArray.h | 0 .../common-hal/nvm/__init__.c | 0 .../common-hal/os/__init__.c | 0 .../common-hal/paralleldisplay/ParallelBus.c | 0 .../common-hal/paralleldisplay/ParallelBus.h | 0 .../common-hal/ps2io/Ps2.c | 0 .../common-hal/ps2io/Ps2.h | 0 .../common-hal/ps2io/__init__.c | 0 .../common-hal/pulseio/PulseIn.c | 0 .../common-hal/pulseio/PulseIn.h | 0 .../common-hal/pulseio/PulseOut.c | 0 .../common-hal/pulseio/PulseOut.h | 0 .../common-hal/pulseio/__init__.c | 0 .../common-hal/pwmio/PWMOut.c | 0 .../common-hal/pwmio/PWMOut.h | 0 .../common-hal/pwmio/__init__.c | 0 .../common-hal/rgbmatrix/RGBMatrix.c | 0 .../common-hal/rgbmatrix/RGBMatrix.h | 0 .../common-hal/rgbmatrix/__init__.c | 0 .../common-hal/rgbmatrix/__init__.h | 0 .../common-hal/rotaryio/IncrementalEncoder.c | 0 .../common-hal/rotaryio/IncrementalEncoder.h | 0 .../common-hal/rotaryio/__init__.c | 0 .../common-hal/rtc/RTC.c | 0 .../common-hal/rtc/RTC.h | 0 .../common-hal/rtc/__init__.c | 0 .../common-hal/socketpool/Socket.c | 0 .../common-hal/socketpool/Socket.h | 0 .../common-hal/socketpool/SocketPool.c | 0 .../common-hal/socketpool/SocketPool.h | 0 .../common-hal/socketpool/__init__.c | 0 .../common-hal/socketpool/__init__.h | 0 .../common-hal/ssl/SSLContext.c | 0 .../common-hal/ssl/SSLContext.h | 0 .../common-hal/ssl/SSLSocket.c | 0 .../common-hal/ssl/SSLSocket.h | 0 .../common-hal/ssl/__init__.c | 0 .../common-hal/ssl/__init__.h | 0 .../common-hal/supervisor/Runtime.c | 0 .../common-hal/supervisor/Runtime.h | 0 .../common-hal/supervisor/__init__.c | 0 .../common-hal/time/__init__.c | 0 .../common-hal/touchio/TouchIn.c | 0 .../common-hal/touchio/TouchIn.h | 0 .../common-hal/touchio/__init__.c | 0 .../common-hal/watchdog/WatchDogMode.c | 0 .../common-hal/watchdog/WatchDogTimer.c | 0 .../common-hal/watchdog/WatchDogTimer.h | 0 .../common-hal/watchdog/__init__.c | 0 .../common-hal/wifi/Network.c | 0 .../common-hal/wifi/Network.h | 0 .../common-hal/wifi/Radio.c | 0 .../common-hal/wifi/Radio.h | 0 .../common-hal/wifi/ScannedNetworks.c | 0 .../common-hal/wifi/ScannedNetworks.h | 0 .../common-hal/wifi/__init__.c | 0 .../common-hal/wifi/__init__.h | 0 ports/{esp32s2 => espressif}/esp-idf | 0 .../esp-idf-config/partitions-16MB.csv | 0 .../esp-idf-config/partitions-4MB.csv | 0 .../esp-idf-config/partitions-8MB.csv | 0 .../esp-idf-config/sdkconfig-16MB.defaults | 0 .../esp-idf-config/sdkconfig-4MB.defaults | 0 .../esp-idf-config/sdkconfig-8MB.defaults | 0 .../esp-idf-config/sdkconfig-debug.defaults | 0 .../esp-idf-config/sdkconfig-opt.defaults | 0 .../esp-idf-config/sdkconfig.defaults | 0 .../esp32s2_peripherals_config.h | 0 ports/{esp32s2 => espressif}/esp_error.c | 0 ports/{esp32s2 => espressif}/fatfs_port.c | 0 ports/{esp32s2 => espressif}/modules/module.h | 0 ports/{esp32s2 => espressif}/modules/none.c | 0 ports/{esp32s2 => espressif}/modules/wroom.c | 0 ports/{esp32s2 => espressif}/modules/wrover.c | 0 ports/{esp32s2 => espressif}/mpconfigport.h | 0 ports/{esp32s2 => espressif}/mpconfigport.mk | 0 ports/{esp32s2 => espressif}/mphalport.c | 0 ports/{esp32s2 => espressif}/mphalport.h | 0 .../{esp32s2 => espressif}/peripherals/pcnt.c | 0 .../{esp32s2 => espressif}/peripherals/pcnt.h | 0 .../{esp32s2 => espressif}/peripherals/pins.c | 0 .../{esp32s2 => espressif}/peripherals/pins.h | 0 .../{esp32s2 => espressif}/peripherals/rmt.c | 0 .../{esp32s2 => espressif}/peripherals/rmt.h | 0 .../peripherals/timer.c | 0 .../peripherals/timer.h | 0 .../peripherals/touch.c | 0 .../peripherals/touch.h | 0 ports/{esp32s2 => espressif}/qstrdefsport.h | 0 .../supervisor/esp_port.h | 0 .../supervisor/internal_flash.c | 0 .../supervisor/internal_flash.h | 0 .../supervisor/internal_flash_root_pointers.h | 0 .../{esp32s2 => espressif}/supervisor/port.c | 0 ports/{esp32s2 => espressif}/supervisor/usb.c | 0 .../tools/build_memory_info.py | 0 .../tools/decode_backtrace.py | 0 py/circuitpy_mpconfig.mk | 2 +- tools/build_board_info.py | 2 +- tools/ci.sh | 584 ------------------ tools/ci_changed_board_list.py | 2 +- tools/merge_micropython.py | 2 +- 351 files changed, 166 insertions(+), 745 deletions(-) rename ports/{esp32s2 => espressif}/.gitignore (100%) rename ports/{esp32s2 => espressif}/CMakeLists.txt (100%) rename ports/{esp32s2 => espressif}/Makefile (100%) rename ports/{esp32s2 => espressif}/README.rst (100%) rename ports/{esp32s2 => espressif}/background.c (100%) rename ports/{esp32s2 => espressif}/background.h (100%) rename ports/{esp32s2 => espressif}/bindings/espidf/__init__.c (100%) rename ports/{esp32s2 => espressif}/bindings/espidf/__init__.h (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_nopsram/board.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_nopsram/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_nopsram/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_funhouse/board.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_funhouse/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_funhouse/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_funhouse/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_funhouse/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_magtag_2.9_grayscale/board.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_magtag_2.9_grayscale/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_magtag_2.9_grayscale/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_metro_esp32s2/board.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_metro_esp32s2/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_metro_esp32s2/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_metro_esp32s2/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/adafruit_metro_esp32s2/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/ai_thinker_esp_12k_nodemcu/board.c (100%) rename ports/{esp32s2 => espressif}/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/ai_thinker_esp_12k_nodemcu/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/ai_thinker_esp_12k_nodemcu/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/artisense_rd00/board.c (100%) rename ports/{esp32s2 => espressif}/boards/artisense_rd00/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/artisense_rd00/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/artisense_rd00/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/artisense_rd00/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/atmegazero_esp32s2/board.c (100%) rename ports/{esp32s2 => espressif}/boards/atmegazero_esp32s2/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/atmegazero_esp32s2/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/atmegazero_esp32s2/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/atmegazero_esp32s2/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/crumpspace_crumps2/board.c (100%) rename ports/{esp32s2 => espressif}/boards/crumpspace_crumps2/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/crumpspace_crumps2/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/crumpspace_crumps2/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/crumpspace_crumps2/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/electroniccats_bastwifi/board.c (100%) rename ports/{esp32s2 => espressif}/boards/electroniccats_bastwifi/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/electroniccats_bastwifi/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/electroniccats_bastwifi/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/electroniccats_bastwifi/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/espressif_hmi_devkit_1/board.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_hmi_devkit_1/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/espressif_hmi_devkit_1/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/espressif_hmi_devkit_1/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_hmi_devkit_1/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1.3/board.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1.3/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1.3/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1.3/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1.3/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1/board.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_kaluga_1/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wroom/board.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wroom/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wroom/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wroom/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wroom/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wrover/board.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wrover/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wrover/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wrover/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/espressif_saola_1_wrover/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wroom/board.c (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wroom/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wroom/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wroom/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wroom/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wrover/board.c (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wrover/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wrover/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wrover/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/franzininho_wifi_wrover/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_m/board.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_m/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_m/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_m/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_m/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_ms/board.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_ms/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_ms/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_ms/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_ms/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_r/board.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_r/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_r/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_r/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_r/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_rs/board.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_rs/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_rs/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_rs/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/gravitech_cucumber_rs/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/lilygo_ttgo_t8_s2_st7789/board.c (100%) rename ports/{esp32s2 => espressif}/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/lilygo_ttgo_t8_s2_st7789/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/lolin_s2_mini/board.c (100%) rename ports/{esp32s2 => espressif}/boards/lolin_s2_mini/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/lolin_s2_mini/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/lolin_s2_mini/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/lolin_s2_mini/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/microdev_micro_s2/board.c (100%) rename ports/{esp32s2 => espressif}/boards/microdev_micro_s2/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/microdev_micro_s2/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/microdev_micro_s2/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/microdev_micro_s2/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/morpheans_morphesp-240/board.c (100%) rename ports/{esp32s2 => espressif}/boards/morpheans_morphesp-240/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/morpheans_morphesp-240/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/morpheans_morphesp-240/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/morpheans_morphesp-240/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wroom/board.c (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wroom/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wroom/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wrover/board.c (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wrover/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/muselab_nanoesp32_s2_wrover/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/odt_pixelwing_esp32_s2/board.c (100%) rename ports/{esp32s2 => espressif}/boards/odt_pixelwing_esp32_s2/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/odt_pixelwing_esp32_s2/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/odt_pixelwing_esp32_s2/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wroom/board.c (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wroom/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wroom/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wroom/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wroom/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wrover/board.c (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wrover/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wrover/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wrover/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/targett_module_clip_wrover/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2/board.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_neo/board.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_neo/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_neo/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_prerelease/board.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_prerelease/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_feathers2_prerelease/sdkconfig (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_tinys2/board.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_tinys2/mpconfigboard.h (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_tinys2/mpconfigboard.mk (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_tinys2/pins.c (100%) rename ports/{esp32s2 => espressif}/boards/unexpectedmaker_tinys2/sdkconfig (100%) rename ports/{esp32s2 => espressif}/cam.c (100%) rename ports/{esp32s2 => espressif}/cam.h (100%) rename ports/{esp32s2 => espressif}/certificates/README.md (100%) rename ports/{esp32s2 => espressif}/certificates/nina-fw (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/SleepMemory.c (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/SleepMemory.h (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/pin/PinAlarm.c (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/pin/PinAlarm.h (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/time/TimeAlarm.c (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/time/TimeAlarm.h (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/touch/TouchAlarm.c (100%) rename ports/{esp32s2 => espressif}/common-hal/alarm/touch/TouchAlarm.h (100%) rename ports/{esp32s2 => espressif}/common-hal/analogio/AnalogIn.c (100%) rename ports/{esp32s2 => espressif}/common-hal/analogio/AnalogIn.h (100%) rename ports/{esp32s2 => espressif}/common-hal/analogio/AnalogOut.c (100%) rename ports/{esp32s2 => espressif}/common-hal/analogio/AnalogOut.h (100%) rename ports/{esp32s2 => espressif}/common-hal/analogio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/audiobusio/I2SOut.c (100%) rename ports/{esp32s2 => espressif}/common-hal/audiobusio/I2SOut.h (100%) rename ports/{esp32s2 => espressif}/common-hal/audiobusio/PDMIn.c (100%) rename ports/{esp32s2 => espressif}/common-hal/audiobusio/PDMIn.h (100%) rename ports/{esp32s2 => espressif}/common-hal/audiobusio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/audiobusio/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/board/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/busio/I2C.c (100%) rename ports/{esp32s2 => espressif}/common-hal/busio/I2C.h (100%) rename ports/{esp32s2 => espressif}/common-hal/busio/SPI.c (100%) rename ports/{esp32s2 => espressif}/common-hal/busio/SPI.h (100%) rename ports/{esp32s2 => espressif}/common-hal/busio/UART.c (100%) rename ports/{esp32s2 => espressif}/common-hal/busio/UART.h (100%) rename ports/{esp32s2 => espressif}/common-hal/busio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/canio/CAN.c (100%) rename ports/{esp32s2 => espressif}/common-hal/canio/CAN.h (100%) rename ports/{esp32s2 => espressif}/common-hal/canio/Listener.c (100%) rename ports/{esp32s2 => espressif}/common-hal/canio/Listener.h (100%) rename ports/{esp32s2 => espressif}/common-hal/canio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/canio/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/countio/Counter.c (100%) rename ports/{esp32s2 => espressif}/common-hal/countio/Counter.h (100%) rename ports/{esp32s2 => espressif}/common-hal/countio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/digitalio/DigitalInOut.c (100%) rename ports/{esp32s2 => espressif}/common-hal/digitalio/DigitalInOut.h (100%) rename ports/{esp32s2 => espressif}/common-hal/digitalio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/dualbank/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/dualbank/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/frequencyio/FrequencyIn.c (100%) rename ports/{esp32s2 => espressif}/common-hal/frequencyio/FrequencyIn.h (100%) rename ports/{esp32s2 => espressif}/common-hal/frequencyio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/imagecapture/ParallelImageCapture.c (100%) rename ports/{esp32s2 => espressif}/common-hal/imagecapture/ParallelImageCapture.h (100%) rename ports/{esp32s2 => espressif}/common-hal/imagecapture/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/imagecapture/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/microcontroller/Pin.c (100%) rename ports/{esp32s2 => espressif}/common-hal/microcontroller/Pin.h (100%) rename ports/{esp32s2 => espressif}/common-hal/microcontroller/Processor.c (100%) rename ports/{esp32s2 => espressif}/common-hal/microcontroller/Processor.h (100%) rename ports/{esp32s2 => espressif}/common-hal/microcontroller/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/neopixel_write/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/nvm/ByteArray.c (100%) rename ports/{esp32s2 => espressif}/common-hal/nvm/ByteArray.h (100%) rename ports/{esp32s2 => espressif}/common-hal/nvm/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/os/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/paralleldisplay/ParallelBus.c (100%) rename ports/{esp32s2 => espressif}/common-hal/paralleldisplay/ParallelBus.h (100%) rename ports/{esp32s2 => espressif}/common-hal/ps2io/Ps2.c (100%) rename ports/{esp32s2 => espressif}/common-hal/ps2io/Ps2.h (100%) rename ports/{esp32s2 => espressif}/common-hal/ps2io/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/pulseio/PulseIn.c (100%) rename ports/{esp32s2 => espressif}/common-hal/pulseio/PulseIn.h (100%) rename ports/{esp32s2 => espressif}/common-hal/pulseio/PulseOut.c (100%) rename ports/{esp32s2 => espressif}/common-hal/pulseio/PulseOut.h (100%) rename ports/{esp32s2 => espressif}/common-hal/pulseio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/pwmio/PWMOut.c (100%) rename ports/{esp32s2 => espressif}/common-hal/pwmio/PWMOut.h (100%) rename ports/{esp32s2 => espressif}/common-hal/pwmio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/rgbmatrix/RGBMatrix.c (100%) rename ports/{esp32s2 => espressif}/common-hal/rgbmatrix/RGBMatrix.h (100%) rename ports/{esp32s2 => espressif}/common-hal/rgbmatrix/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/rgbmatrix/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/rotaryio/IncrementalEncoder.c (100%) rename ports/{esp32s2 => espressif}/common-hal/rotaryio/IncrementalEncoder.h (100%) rename ports/{esp32s2 => espressif}/common-hal/rotaryio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/rtc/RTC.c (100%) rename ports/{esp32s2 => espressif}/common-hal/rtc/RTC.h (100%) rename ports/{esp32s2 => espressif}/common-hal/rtc/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/socketpool/Socket.c (100%) rename ports/{esp32s2 => espressif}/common-hal/socketpool/Socket.h (100%) rename ports/{esp32s2 => espressif}/common-hal/socketpool/SocketPool.c (100%) rename ports/{esp32s2 => espressif}/common-hal/socketpool/SocketPool.h (100%) rename ports/{esp32s2 => espressif}/common-hal/socketpool/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/socketpool/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/ssl/SSLContext.c (100%) rename ports/{esp32s2 => espressif}/common-hal/ssl/SSLContext.h (100%) rename ports/{esp32s2 => espressif}/common-hal/ssl/SSLSocket.c (100%) rename ports/{esp32s2 => espressif}/common-hal/ssl/SSLSocket.h (100%) rename ports/{esp32s2 => espressif}/common-hal/ssl/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/ssl/__init__.h (100%) rename ports/{esp32s2 => espressif}/common-hal/supervisor/Runtime.c (100%) rename ports/{esp32s2 => espressif}/common-hal/supervisor/Runtime.h (100%) rename ports/{esp32s2 => espressif}/common-hal/supervisor/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/time/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/touchio/TouchIn.c (100%) rename ports/{esp32s2 => espressif}/common-hal/touchio/TouchIn.h (100%) rename ports/{esp32s2 => espressif}/common-hal/touchio/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/watchdog/WatchDogMode.c (100%) rename ports/{esp32s2 => espressif}/common-hal/watchdog/WatchDogTimer.c (100%) rename ports/{esp32s2 => espressif}/common-hal/watchdog/WatchDogTimer.h (100%) rename ports/{esp32s2 => espressif}/common-hal/watchdog/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/Network.c (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/Network.h (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/Radio.c (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/Radio.h (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/ScannedNetworks.c (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/ScannedNetworks.h (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/__init__.c (100%) rename ports/{esp32s2 => espressif}/common-hal/wifi/__init__.h (100%) rename ports/{esp32s2 => espressif}/esp-idf (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/partitions-16MB.csv (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/partitions-4MB.csv (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/partitions-8MB.csv (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/sdkconfig-16MB.defaults (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/sdkconfig-4MB.defaults (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/sdkconfig-8MB.defaults (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/sdkconfig-debug.defaults (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/sdkconfig-opt.defaults (100%) rename ports/{esp32s2 => espressif}/esp-idf-config/sdkconfig.defaults (100%) rename ports/{esp32s2 => espressif}/esp32s2_peripherals_config.h (100%) rename ports/{esp32s2 => espressif}/esp_error.c (100%) rename ports/{esp32s2 => espressif}/fatfs_port.c (100%) rename ports/{esp32s2 => espressif}/modules/module.h (100%) rename ports/{esp32s2 => espressif}/modules/none.c (100%) rename ports/{esp32s2 => espressif}/modules/wroom.c (100%) rename ports/{esp32s2 => espressif}/modules/wrover.c (100%) rename ports/{esp32s2 => espressif}/mpconfigport.h (100%) rename ports/{esp32s2 => espressif}/mpconfigport.mk (100%) rename ports/{esp32s2 => espressif}/mphalport.c (100%) rename ports/{esp32s2 => espressif}/mphalport.h (100%) rename ports/{esp32s2 => espressif}/peripherals/pcnt.c (100%) rename ports/{esp32s2 => espressif}/peripherals/pcnt.h (100%) rename ports/{esp32s2 => espressif}/peripherals/pins.c (100%) rename ports/{esp32s2 => espressif}/peripherals/pins.h (100%) rename ports/{esp32s2 => espressif}/peripherals/rmt.c (100%) rename ports/{esp32s2 => espressif}/peripherals/rmt.h (100%) rename ports/{esp32s2 => espressif}/peripherals/timer.c (100%) rename ports/{esp32s2 => espressif}/peripherals/timer.h (100%) rename ports/{esp32s2 => espressif}/peripherals/touch.c (100%) rename ports/{esp32s2 => espressif}/peripherals/touch.h (100%) rename ports/{esp32s2 => espressif}/qstrdefsport.h (100%) rename ports/{esp32s2 => espressif}/supervisor/esp_port.h (100%) rename ports/{esp32s2 => espressif}/supervisor/internal_flash.c (100%) rename ports/{esp32s2 => espressif}/supervisor/internal_flash.h (100%) rename ports/{esp32s2 => espressif}/supervisor/internal_flash_root_pointers.h (100%) rename ports/{esp32s2 => espressif}/supervisor/port.c (100%) rename ports/{esp32s2 => espressif}/supervisor/usb.c (100%) rename ports/{esp32s2 => espressif}/tools/build_memory_info.py (100%) rename ports/{esp32s2 => espressif}/tools/decode_backtrace.py (100%) delete mode 100755 tools/ci.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c743bdb91..f51727f509 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -322,14 +322,14 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')) - build-xtensa: + build-espressif: runs-on: ubuntu-20.04 needs: test strategy: fail-fast: false matrix: - board: ${{ fromJSON(needs.test.outputs.xtensa-boards) }} - if: ${{ needs.test.outputs.xtensa-boards != '[]' }} + board: ${{ fromJSON(needs.test.outputs.espressif-boards) }} + if: ${{ needs.test.outputs.espressif-boards != '[]' }} steps: - name: Set up Python 3.8 @@ -348,12 +348,12 @@ jobs: id: idf-cache with: path: ${{ github.workspace }}/.idf_tools - key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210716 + key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210716 - name: Clone IDF submodules run: | (cd $IDF_PATH && git submodule update --init) env: - IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf + IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf - name: Install IDF tools run: | $IDF_PATH/tools/idf_tools.py --non-interactive install required @@ -361,7 +361,7 @@ jobs: $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env rm -rf $IDF_TOOLS_PATH/dist env: - IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf + IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools - name: Install CircuitPython deps run: | @@ -369,7 +369,7 @@ jobs: pip install -r requirements-dev.txt sudo apt-get install -y gettext ninja-build env: - IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf + IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools - name: Versions run: | @@ -381,7 +381,7 @@ jobs: cmake --version shell: bash env: - IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf + IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools - name: mpy-cross run: make -C mpy-cross -j2 @@ -394,7 +394,7 @@ jobs: working-directory: tools shell: bash env: - IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf + IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools BOARDS: ${{ matrix.board }} - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml index 463684bfe9..4b86f320ed 100644 --- a/.github/workflows/ports_windows.yml +++ b/.github/workflows/ports_windows.yml @@ -99,8 +99,8 @@ jobs: # https://github.com/espressif/esp-idf/issues/7062 # # - name: prepare esp -# run: ports/esp32s2/esp-idf/install.bat +# run: ports/espressif/esp-idf/install.bat # shell: cmd # # - name: build esp -# run: . ports/esp32s2/esp-idf/export.sh && make -j2 -C ports/esp32s2 BOARD=adafruit_metro_esp32s2 +# run: . ports/espressif/esp-idf/export.sh && make -j2 -C ports/espressif BOARD=adafruit_metro_esp32s2 diff --git a/.gitmodules b/.gitmodules index 6089411280..1c6a98eb9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -151,11 +151,11 @@ path = frozen/Adafruit_CircuitPython_RFM69 url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git [submodule "ports/esp32s2/esp-idf"] - path = ports/esp32s2/esp-idf + path = ports/espressif/esp-idf url = https://github.com/espressif/esp-idf.git branch = release/v4.3 [submodule "ports/esp32s2/certificates/nina-fw"] - path = ports/esp32s2/certificates/nina-fw + path = ports/espressif/certificates/nina-fw url = https://github.com/adafruit/nina-fw.git [submodule "frozen/Adafruit_CircuitPython_ST7789"] path = frozen/Adafruit_CircuitPython_ST7789 diff --git a/Makefile b/Makefile index a26eef5c27..db0e871256 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS) # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(BASEOPTS) -TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/esp32s2 ports/mimxrt10xx ports/nrf ports/raspberrypi ports/stm py shared-bindings shared-module supervisor +TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/espressif ports/mimxrt10xx ports/nrf ports/raspberrypi ports/stm py shared-bindings shared-module supervisor # Paths to exclude from TRANSLATE_SOURCES # Each must be preceded by "-path"; if any wildcards, enclose in quotes. # Separate by "-o" (Find's "or" operand) @@ -48,7 +48,7 @@ TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \ -o -path "ports/*/build" \ -o -path ports/atmel-samd/asf4 \ -o -path ports/cxd56/spresense-exported-sdk \ - -o -path ports/esp32s2/esp-idf \ + -o -path ports/espressif/esp-idf \ -o -path ports/mimxrt10xx/sdk \ -o -path ports/raspberrypi/sdk \ -o -path ports/stm/st_driver \ @@ -283,8 +283,8 @@ samd21: samd51: $(MAKE) -C ports/atmel-samd BOARD=feather_m4_express -esp32s2: - $(MAKE) -C ports/esp32s2 BOARD=espressif_saola_1_wroom +espressif: + $(MAKE) -C ports/espressif BOARD=espressif_saola_1_wroom litex: $(MAKE) -C ports/litex BOARD=fomu @@ -298,7 +298,7 @@ nrf: stm: $(MAKE) -C ports/stm BOARD=feather_stm32f405_express -clean-one-of-each: clean-samd21 clean-samd51 clean-esp32s2 clean-litex clean-mimxrt10xx clean-nrf clean-stm +clean-one-of-each: clean-samd21 clean-samd51 clean-espressif clean-litex clean-mimxrt10xx clean-nrf clean-stm clean-samd21: $(MAKE) -C ports/atmel-samd BOARD=trinket_m0 clean @@ -306,8 +306,8 @@ clean-samd21: clean-samd51: $(MAKE) -C ports/atmel-samd BOARD=feather_m4_express clean -clean-esp32s2: - $(MAKE) -C ports/esp32s2 BOARD=espressif_saola_1_wroom clean +clean-espressif: + $(MAKE) -C ports/espressif BOARD=espressif_saola_1_wroom clean clean-litex: $(MAKE) -C ports/litex BOARD=fomu clean diff --git a/README.rst b/README.rst index b594174d5b..c6e9a33994 100644 --- a/README.rst +++ b/README.rst @@ -213,7 +213,7 @@ Supported Support status ================ ============================================================ atmel-samd ``SAMD21`` stable | ``SAMD51`` stable cxd56 stable -esp32s2 stable +espressif stable litex alpha mimxrt10xx alpha nrf stable diff --git a/WEBUSB_README.md b/WEBUSB_README.md index 8250941eb0..ecae66308a 100644 --- a/WEBUSB_README.md +++ b/WEBUSB_README.md @@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT # WebUSB Serial Support -To date, this has only been tested on one port (esp32s2), on one board (espressif_kaluga_1). +To date, this has only been tested on one port (espressif), on one board (espressif_kaluga_1). ## What it does diff --git a/conf.py b/conf.py index 866e761748..0dac441b0d 100644 --- a/conf.py +++ b/conf.py @@ -188,10 +188,10 @@ exclude_patterns = ["**/build*", "ports/atmel-samd/tools", "ports/cxd56/mkspk", "ports/cxd56/spresense-exported-sdk", - "ports/esp32s2/certificates", - "ports/esp32s2/esp-idf", - "ports/esp32s2/.idf_tools", - "ports/esp32s2/peripherals", + "ports/espressif/certificates", + "ports/espressif/esp-idf", + "ports/espressif/.idf_tools", + "ports/espressif/peripherals", "ports/litex/hw", "ports/minimal", "ports/mimxrt10xx/peripherals", diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py index bfe83b3aaf..7954e96bfd 100644 --- a/docs/shared_bindings_matrix.py +++ b/docs/shared_bindings_matrix.py @@ -30,7 +30,7 @@ import sys from concurrent.futures import ThreadPoolExecutor -SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'esp32s2', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm'] +SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm'] aliases_by_board = { "circuitplayground_express": [ diff --git a/docs/supported_ports.rst b/docs/supported_ports.rst index b83ef12d35..fbe61e81ce 100644 --- a/docs/supported_ports.rst +++ b/docs/supported_ports.rst @@ -13,7 +13,7 @@ is limited. ../ports/atmel-samd/README ../ports/cxd56/README - ../ports/esp32s2/README + ../ports/espressif/README ../ports/litex/README ../ports/mimxrt10xx/README ../ports/nrf/README diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 61cec6f617..f58a84917b 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -139,7 +139,8 @@ msgstr "" msgid "%q must be a tuple of length 2" msgstr "" -#: ports/esp32s2/common-hal/imagecapture/ParallelImageCapture.c +#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c +#: shared-module/vectorio/VectorShape.c msgid "%q must be between %d and %d" msgstr "" @@ -172,7 +173,7 @@ msgstr "" msgid "%q, %q, and %q must all be the same length" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c #, c-format msgid "%s error 0x%x" msgstr "" @@ -351,7 +352,7 @@ msgstr "" msgid "A hardware interrupt channel is already in use" msgstr "" -#: ports/esp32s2/common-hal/analogio/AnalogIn.c +#: ports/espressif/common-hal/analogio/AnalogIn.c msgid "ADC2 is being used by WiFi" msgstr "" @@ -364,31 +365,31 @@ msgstr "" msgid "Address type out of range" msgstr "" -#: ports/esp32s2/common-hal/canio/CAN.c +#: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" msgstr "" -#: ports/esp32s2/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "" -#: ports/esp32s2/common-hal/countio/Counter.c -#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c -#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c +#: ports/espressif/common-hal/countio/Counter.c +#: ports/espressif/common-hal/frequencyio/FrequencyIn.c +#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c msgid "All PCNT units in use" msgstr "" #: ports/atmel-samd/common-hal/canio/Listener.c -#: ports/esp32s2/common-hal/canio/Listener.c +#: ports/espressif/common-hal/canio/Listener.c #: ports/stm/common-hal/canio/Listener.c msgid "All RX FIFOs in use" msgstr "" -#: ports/esp32s2/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "" -#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "" @@ -423,10 +424,10 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c -#: ports/esp32s2/common-hal/neopixel_write/__init__.c -#: ports/esp32s2/common-hal/pulseio/PulseIn.c -#: ports/esp32s2/common-hal/pulseio/PulseOut.c +#: ports/espressif/common-hal/frequencyio/FrequencyIn.c +#: ports/espressif/common-hal/neopixel_write/__init__.c +#: ports/espressif/common-hal/pulseio/PulseIn.c +#: ports/espressif/common-hal/pulseio/PulseOut.c #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c @@ -447,7 +448,7 @@ msgstr "" msgid "Already running" msgstr "" -#: ports/esp32s2/common-hal/wifi/Radio.c +#: ports/espressif/common-hal/wifi/Radio.c msgid "Already scanning for wifi networks" msgstr "" @@ -522,7 +523,7 @@ msgid "" "disable.\n" msgstr "" -#: ports/esp32s2/common-hal/canio/CAN.c +#: ports/espressif/common-hal/canio/CAN.c msgid "Baudrate not supported by peripheral" msgstr "" @@ -620,7 +621,7 @@ msgid "Buffer too short by %d bytes" msgstr "" #: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c #: ports/nrf/common-hal/paralleldisplay/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format @@ -639,7 +640,7 @@ msgstr "" msgid "CBC blocks must be multiples of 16 bytes" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "CRC or checksum was invalid" msgstr "" @@ -647,15 +648,15 @@ msgstr "" msgid "Call super().__init__() before accessing native object." msgstr "" -#: ports/esp32s2/common-hal/alarm/pin/PinAlarm.c +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on RTC IO from deep sleep." msgstr "" -#: ports/esp32s2/common-hal/alarm/pin/PinAlarm.c +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on one low pin while others alarm high from deep sleep." msgstr "" -#: ports/esp32s2/common-hal/alarm/pin/PinAlarm.c +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Can only alarm on two low pins from deep sleep." msgstr "" @@ -697,7 +698,7 @@ msgstr "" msgid "Cannot output both channels on the same pin" msgstr "" -#: ports/esp32s2/common-hal/alarm/pin/PinAlarm.c +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c msgid "Cannot pull on input-only pin." msgstr "" @@ -719,7 +720,7 @@ msgstr "" msgid "Cannot reset into bootloader because no bootloader is present." msgstr "" -#: ports/esp32s2/common-hal/socketpool/Socket.c +#: ports/espressif/common-hal/socketpool/Socket.c msgid "Cannot set socket options" msgstr "" @@ -727,7 +728,7 @@ msgstr "" msgid "Cannot set value when direction is input." msgstr "" -#: ports/esp32s2/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "Cannot specify RTS or CTS in RS485 mode" msgstr "" @@ -744,7 +745,7 @@ msgstr "" msgid "Cannot vary frequency on a timer that is already in use" msgstr "" -#: ports/esp32s2/common-hal/alarm/pin/PinAlarm.c +#: ports/espressif/common-hal/alarm/pin/PinAlarm.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge. Only level." msgstr "" @@ -809,7 +810,7 @@ msgid "Could not initialize SDCard" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/esp32s2/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c msgid "Could not initialize UART" msgstr "" @@ -825,7 +826,7 @@ msgstr "" msgid "Could not restart PWM" msgstr "" -#: ports/esp32s2/common-hal/neopixel_write/__init__.c +#: ports/espressif/common-hal/neopixel_write/__init__.c msgid "Could not retrieve clock" msgstr "" @@ -880,7 +881,7 @@ msgstr "" msgid "Data 0 pin must be byte aligned" msgstr "" -#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -931,7 +932,8 @@ msgstr "" msgid "ECB only operates on 16 bytes at a time" msgstr "" -#: ports/esp32s2/common-hal/busio/SPI.c ports/esp32s2/common-hal/canio/CAN.c +#: ports/espressif/common-hal/busio/SPI.c +#: ports/espressif/common-hal/canio/CAN.c msgid "ESP-IDF memory allocation failed" msgstr "" @@ -1010,7 +1012,7 @@ msgstr "" msgid "FFT is implemented for linear arrays only" msgstr "" -#: ports/esp32s2/common-hal/ssl/SSLSocket.c +#: ports/espressif/common-hal/ssl/SSLSocket.c msgid "Failed SSL handshake" msgstr "" @@ -1031,7 +1033,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/esp32s2/common-hal/pulseio/PulseIn.c +#: ports/espressif/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c @@ -1039,11 +1041,11 @@ msgstr "" msgid "Failed to allocate RX buffer of %d bytes" msgstr "" -#: ports/esp32s2/common-hal/wifi/__init__.c +#: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to allocate Wifi memory" msgstr "" -#: ports/esp32s2/common-hal/wifi/ScannedNetworks.c +#: ports/espressif/common-hal/wifi/ScannedNetworks.c msgid "Failed to allocate wifi scan memory" msgstr "" @@ -1059,7 +1061,7 @@ msgstr "" msgid "Failed to connect: timeout" msgstr "" -#: ports/esp32s2/common-hal/wifi/__init__.c +#: ports/espressif/common-hal/wifi/__init__.c msgid "Failed to init wifi" msgstr "" @@ -1085,12 +1087,12 @@ msgid "File exists" msgstr "" #: ports/atmel-samd/common-hal/canio/Listener.c -#: ports/esp32s2/common-hal/canio/Listener.c +#: ports/espressif/common-hal/canio/Listener.c #: ports/stm/common-hal/canio/Listener.c msgid "Filters too complex" msgstr "" -#: ports/esp32s2/common-hal/dualbank/__init__.c +#: ports/espressif/common-hal/dualbank/__init__.c msgid "Firmware image is invalid" msgstr "" @@ -1112,7 +1114,7 @@ msgstr "" msgid "Function requires lock" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Generic Failure" msgstr "" @@ -1183,7 +1185,7 @@ msgstr "" msgid "Initial set pin state conflicts with initial out pin state" msgstr "" -#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c +#: ports/espressif/common-hal/watchdog/WatchDogTimer.c msgid "Initialization failed due to lack of memory" msgstr "" @@ -1196,7 +1198,7 @@ msgstr "" msgid "Input taking too long" msgstr "" -#: ports/esp32s2/common-hal/neopixel_write/__init__.c py/moduerrno.c +#: ports/espressif/common-hal/neopixel_write/__init__.c py/moduerrno.c msgid "Input/output error" msgstr "" @@ -1262,7 +1264,7 @@ msgstr "" msgid "Invalid ADC Unit value" msgstr "" -#: ports/esp32s2/common-hal/wifi/Radio.c +#: ports/espressif/common-hal/wifi/Radio.c msgid "Invalid AuthMode" msgstr "" @@ -1278,7 +1280,7 @@ msgstr "" msgid "Invalid BSSID" msgstr "" -#: ports/esp32s2/common-hal/analogio/AnalogOut.c +#: ports/espressif/common-hal/analogio/AnalogOut.c #: ports/stm/common-hal/analogio/AnalogOut.c msgid "Invalid DAC pin supplied" msgstr "" @@ -1289,18 +1291,18 @@ msgstr "" #: ports/atmel-samd/common-hal/pwmio/PWMOut.c #: ports/cxd56/common-hal/pwmio/PWMOut.c -#: ports/esp32s2/common-hal/pwmio/PWMOut.c +#: ports/espressif/common-hal/pwmio/PWMOut.c #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c #: ports/nrf/common-hal/pwmio/PWMOut.c #: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c msgid "Invalid PWM frequency" msgstr "" -#: ports/esp32s2/common-hal/analogio/AnalogIn.c +#: ports/espressif/common-hal/analogio/AnalogIn.c msgid "Invalid Pin" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c #: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c msgid "Invalid argument" msgstr "" @@ -1319,7 +1321,7 @@ msgid "Invalid byteorder string" msgstr "" #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c -#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c +#: ports/espressif/common-hal/frequencyio/FrequencyIn.c msgid "Invalid capture period. Valid range: 1 - 500" msgstr "" @@ -1349,7 +1351,7 @@ msgstr "" msgid "Invalid format chunk size" msgstr "" -#: ports/esp32s2/common-hal/busio/I2C.c +#: ports/espressif/common-hal/busio/I2C.c msgid "Invalid frequency" msgstr "" @@ -1368,8 +1370,8 @@ msgstr "" #: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/touchio/TouchIn.c -#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c -#: ports/esp32s2/common-hal/touchio/TouchIn.c +#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c +#: ports/espressif/common-hal/touchio/TouchIn.c #: ports/nrf/common-hal/alarm/pin/PinAlarm.c shared-bindings/pwmio/PWMOut.c #: shared-module/rgbmatrix/RGBMatrix.c msgid "Invalid pin" @@ -1389,8 +1391,10 @@ msgstr "" #: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c #: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c #: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c -#: ports/esp32s2/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/SPI.c -#: ports/esp32s2/common-hal/busio/UART.c ports/esp32s2/common-hal/canio/CAN.c +#: ports/espressif/common-hal/busio/I2C.c +#: ports/espressif/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/UART.c +#: ports/espressif/common-hal/canio/CAN.c #: ports/mimxrt10xx/common-hal/busio/I2C.c #: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c @@ -1417,15 +1421,15 @@ msgstr "" msgid "Invalid security_mode" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid size" msgstr "" -#: ports/esp32s2/common-hal/ssl/SSLContext.c +#: ports/espressif/common-hal/ssl/SSLContext.c msgid "Invalid socket for TLS" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Invalid state" msgstr "" @@ -1462,7 +1466,7 @@ msgstr "" msgid "Layer must be a Group or TileGrid subclass." msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "MAC address was invalid" msgstr "" @@ -1548,7 +1552,7 @@ msgstr "" msgid "NLR jump failed. Likely memory corruption." msgstr "" -#: ports/esp32s2/common-hal/nvm/ByteArray.c +#: ports/espressif/common-hal/nvm/ByteArray.c msgid "NVS Error" msgstr "" @@ -1581,25 +1585,25 @@ msgstr "" msgid "No I2C device at address: %x" msgstr "" -#: ports/esp32s2/common-hal/busio/SPI.c ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "No MISO Pin" msgstr "" -#: ports/esp32s2/common-hal/busio/SPI.c ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c +#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c msgid "No MOSI Pin" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c -#: ports/esp32s2/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "No RX pin" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c -#: ports/esp32s2/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "No TX pin" @@ -1663,7 +1667,8 @@ msgstr "" msgid "No out in program" msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/I2C.c +#: ports/espressif/common-hal/busio/I2C.c #: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" @@ -1725,11 +1730,11 @@ msgstr "" msgid "Only 8 or 16 bit mono with " msgstr "" -#: ports/esp32s2/common-hal/wifi/__init__.c +#: ports/espressif/common-hal/wifi/__init__.c msgid "Only IPv4 addresses supported" msgstr "" -#: ports/esp32s2/common-hal/socketpool/SocketPool.c +#: ports/espressif/common-hal/socketpool/SocketPool.c msgid "Only IPv4 sockets supported" msgstr "" @@ -1758,11 +1763,11 @@ msgid "" "%d bpp given" msgstr "" -#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c +#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c msgid "Only one TouchAlarm can be set in deep sleep." msgstr "" -#: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c +#: ports/espressif/common-hal/alarm/time/TimeAlarm.c #: ports/nrf/common-hal/alarm/time/TimeAlarm.c #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c @@ -1773,19 +1778,19 @@ msgstr "" msgid "Only one color can be transparent at a time" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation or feature not supported" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Operation timed out" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Out of memory" msgstr "" -#: ports/esp32s2/common-hal/socketpool/SocketPool.c +#: ports/espressif/common-hal/socketpool/SocketPool.c msgid "Out of sockets" msgstr "" @@ -1824,7 +1829,7 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/esp32s2/common-hal/audiobusio/__init__.c +#: ports/espressif/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -1846,7 +1851,7 @@ msgstr "" #: ports/atmel-samd/common-hal/analogio/AnalogIn.c #: ports/cxd56/common-hal/analogio/AnalogIn.c -#: ports/esp32s2/common-hal/analogio/AnalogIn.c +#: ports/espressif/common-hal/analogio/AnalogIn.c #: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c #: ports/nrf/common-hal/analogio/AnalogIn.c #: ports/raspberrypi/common-hal/analogio/AnalogIn.c @@ -1949,12 +1954,12 @@ msgstr "" msgid "RS485 Not yet supported on this device" msgstr "" -#: ports/esp32s2/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/UART.c msgid "RS485 inversion specified when not in RS485 mode" msgstr "" -#: ports/cxd56/common-hal/rtc/RTC.c ports/esp32s2/common-hal/rtc/RTC.c +#: ports/cxd56/common-hal/rtc/RTC.c ports/espressif/common-hal/rtc/RTC.c #: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c #: ports/raspberrypi/common-hal/rtc/RTC.c msgid "RTC calibration is not supported on this board" @@ -1986,7 +1991,7 @@ msgstr "" msgid "Read-only object" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Received response was invalid" msgstr "" @@ -2002,7 +2007,7 @@ msgstr "" msgid "Requested AES mode is unsupported" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Requested resource not found" msgstr "" @@ -2040,7 +2045,7 @@ msgstr "" msgid "SPI Re-initialization error" msgstr "" -#: ports/esp32s2/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c msgid "SPI configuration failed" msgstr "" @@ -2097,7 +2102,7 @@ msgstr "" msgid "Slices not supported" msgstr "" -#: ports/esp32s2/common-hal/socketpool/SocketPool.c +#: ports/espressif/common-hal/socketpool/SocketPool.c msgid "SocketPool can only be used with wifi.radio" msgstr "" @@ -2294,7 +2299,7 @@ msgstr "" msgid "Unable to allocate buffers for signed conversion" msgstr "" -#: ports/esp32s2/common-hal/busio/I2C.c +#: ports/espressif/common-hal/busio/I2C.c msgid "Unable to create lock" msgstr "" @@ -2328,7 +2333,7 @@ msgstr "" msgid "Unexpected nrfx uuid type" msgstr "" -#: ports/esp32s2/common-hal/ssl/SSLSocket.c +#: ports/espressif/common-hal/ssl/SSLSocket.c #, c-format msgid "Unhandled ESP TLS error %d %d %x %d" msgstr "" @@ -2369,7 +2374,7 @@ msgid "" msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c -#: ports/esp32s2/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c msgid "Unsupported baudrate" msgstr "" @@ -2390,7 +2395,7 @@ msgstr "" msgid "Unsupported pull value." msgstr "" -#: ports/esp32s2/common-hal/dualbank/__init__.c +#: ports/espressif/common-hal/dualbank/__init__.c msgid "Update Failed" msgstr "" @@ -2404,7 +2409,7 @@ msgstr "" msgid "Value length > max_length" msgstr "" -#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c +#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c msgid "Version was invalid" msgstr "" @@ -2648,7 +2653,7 @@ msgid "byteorder is not a string" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c -#: ports/esp32s2/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c msgid "bytes > 8 bits not supported" msgstr "" @@ -3262,7 +3267,7 @@ msgid "index is out of bounds" msgstr "" #: extmod/ulab/code/numpy/numerical.c extmod/ulab/code/ulab_tools.c -#: ports/esp32s2/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/espressif/common-hal/pulseio/PulseIn.c py/obj.c #: shared-bindings/bitmaptools/__init__.c msgid "index out of range" msgstr "" @@ -3493,7 +3498,7 @@ msgstr "" msgid "long int not supported in this build" msgstr "" -#: ports/esp32s2/common-hal/canio/CAN.c +#: ports/espressif/common-hal/canio/CAN.c msgid "loopback + silent mode not supported by peripheral" msgstr "" @@ -3884,7 +3889,7 @@ msgstr "" msgid "polygon can only be registered in one parent" msgstr "" -#: ports/esp32s2/common-hal/pulseio/PulseIn.c +#: ports/espressif/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -3909,40 +3914,40 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" -#: ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h -#: ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h -#: ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.h -#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h -#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h -#: ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h -#: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h -#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h -#: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h -#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h -#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h -#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h -#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h -#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h -#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h -#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h -#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h -#: ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.h -#: ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.h -#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h -#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h -#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h -#: ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h -#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h -#: ports/esp32s2/boards/odt_pixelwing_esp32_s2/mpconfigboard.h -#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h -#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h -#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h -#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h -#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h -#: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h +#: ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h +#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h +#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h +#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h +#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h +#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h +#: ports/espressif/boards/artisense_rd00/mpconfigboard.h +#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h +#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h +#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h +#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h +#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h +#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h +#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h +#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h +#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h +#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h +#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h +#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h +#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h +#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h +#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h +#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h +#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h +#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h +#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h +#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h +#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h +#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h +#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h +#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" msgstr "" @@ -4184,7 +4189,7 @@ msgstr "" msgid "time.struct_time() takes a 9-sequence" msgstr "" -#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c +#: ports/espressif/common-hal/watchdog/WatchDogTimer.c #: ports/nrf/common-hal/watchdog/WatchDogTimer.c #: ports/raspberrypi/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" @@ -4251,18 +4256,18 @@ msgstr "" msgid "tuple/list has wrong length" msgstr "" -#: ports/esp32s2/common-hal/canio/CAN.c +#: ports/espressif/common-hal/canio/CAN.c #, c-format msgid "twai_driver_install returned esp-idf error #%d" msgstr "" -#: ports/esp32s2/common-hal/canio/CAN.c +#: ports/espressif/common-hal/canio/CAN.c #, c-format msgid "twai_start returned esp-idf error #%d" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c -#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c msgid "tx and rx cannot both be None" msgstr "" @@ -4385,7 +4390,7 @@ msgstr "" msgid "value_count must be > 0" msgstr "" -#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c +#: ports/espressif/common-hal/watchdog/WatchDogTimer.c msgid "watchdog not initialized" msgstr "" @@ -4402,7 +4407,7 @@ msgstr "" msgid "width must be greater than zero" msgstr "" -#: ports/esp32s2/common-hal/wifi/Radio.c +#: ports/espressif/common-hal/wifi/Radio.c msgid "wifi is not enabled" msgstr "" @@ -4438,7 +4443,7 @@ msgstr "" msgid "x value out of bounds" msgstr "" -#: ports/esp32s2/common-hal/audiobusio/__init__.c +#: ports/espressif/common-hal/audiobusio/__init__.c msgid "xTaskCreate failed" msgstr "" diff --git a/ports/esp32s2/.gitignore b/ports/espressif/.gitignore similarity index 100% rename from ports/esp32s2/.gitignore rename to ports/espressif/.gitignore 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.rst b/ports/espressif/README.rst similarity index 100% rename from ports/esp32s2/README.rst rename to ports/espressif/README.rst diff --git a/ports/esp32s2/background.c b/ports/espressif/background.c similarity index 100% rename from ports/esp32s2/background.c rename to ports/espressif/background.c diff --git a/ports/esp32s2/background.h b/ports/espressif/background.h similarity index 100% rename from ports/esp32s2/background.h rename to ports/espressif/background.h diff --git a/ports/esp32s2/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c similarity index 100% rename from ports/esp32s2/bindings/espidf/__init__.c rename to ports/espressif/bindings/espidf/__init__.c diff --git a/ports/esp32s2/bindings/espidf/__init__.h b/ports/espressif/bindings/espidf/__init__.h similarity index 100% rename from ports/esp32s2/bindings/espidf/__init__.h rename to ports/espressif/bindings/espidf/__init__.h diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/board.c similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/board.c rename to ports/espressif/boards/adafruit_feather_esp32s2_nopsram/board.c diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h rename to ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk rename to ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/pins.c similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/pins.c rename to ports/espressif/boards/adafruit_feather_esp32s2_nopsram/pins.c diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/sdkconfig rename to ports/espressif/boards/adafruit_feather_esp32s2_nopsram/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c rename to ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h rename to ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk rename to ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c rename to ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/pins.c diff --git a/ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig rename to ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_funhouse/board.c b/ports/espressif/boards/adafruit_funhouse/board.c similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse/board.c rename to ports/espressif/boards/adafruit_funhouse/board.c diff --git a/ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.h b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.h rename to ports/espressif/boards/adafruit_funhouse/mpconfigboard.h diff --git a/ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.mk rename to ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk diff --git a/ports/esp32s2/boards/adafruit_funhouse/pins.c b/ports/espressif/boards/adafruit_funhouse/pins.c similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse/pins.c rename to ports/espressif/boards/adafruit_funhouse/pins.c diff --git a/ports/esp32s2/boards/adafruit_funhouse/sdkconfig b/ports/espressif/boards/adafruit_funhouse/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_funhouse/sdkconfig rename to ports/espressif/boards/adafruit_funhouse/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/board.c rename to ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c diff --git a/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h rename to ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h diff --git a/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk rename to ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk diff --git a/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/pins.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/pins.c rename to ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c diff --git a/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/sdkconfig b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig similarity index 100% rename from ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/sdkconfig rename to ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/board.c b/ports/espressif/boards/adafruit_metro_esp32s2/board.c similarity index 100% rename from ports/esp32s2/boards/adafruit_metro_esp32s2/board.c rename to ports/espressif/boards/adafruit_metro_esp32s2/board.c diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h rename to ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.mk rename to ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c b/ports/espressif/boards/adafruit_metro_esp32s2/pins.c similarity index 100% rename from ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c rename to ports/espressif/boards/adafruit_metro_esp32s2/pins.c 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/ai_thinker_esp_12k_nodemcu/board.c b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c similarity index 100% rename from ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/board.c rename to ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c diff --git a/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h rename to ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h diff --git a/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk rename to ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk diff --git a/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/pins.c b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/pins.c similarity index 100% rename from ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/pins.c rename to ports/espressif/boards/ai_thinker_esp_12k_nodemcu/pins.c diff --git a/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/sdkconfig b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig similarity index 100% rename from ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/sdkconfig rename to ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig diff --git a/ports/esp32s2/boards/artisense_rd00/board.c b/ports/espressif/boards/artisense_rd00/board.c similarity index 100% rename from ports/esp32s2/boards/artisense_rd00/board.c rename to ports/espressif/boards/artisense_rd00/board.c diff --git a/ports/esp32s2/boards/artisense_rd00/mpconfigboard.h b/ports/espressif/boards/artisense_rd00/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/artisense_rd00/mpconfigboard.h rename to ports/espressif/boards/artisense_rd00/mpconfigboard.h diff --git a/ports/esp32s2/boards/artisense_rd00/mpconfigboard.mk b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/artisense_rd00/mpconfigboard.mk rename to ports/espressif/boards/artisense_rd00/mpconfigboard.mk diff --git a/ports/esp32s2/boards/artisense_rd00/pins.c b/ports/espressif/boards/artisense_rd00/pins.c similarity index 100% rename from ports/esp32s2/boards/artisense_rd00/pins.c rename to ports/espressif/boards/artisense_rd00/pins.c 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.c b/ports/espressif/boards/atmegazero_esp32s2/board.c similarity index 100% rename from ports/esp32s2/boards/atmegazero_esp32s2/board.c rename to ports/espressif/boards/atmegazero_esp32s2/board.c diff --git a/ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h rename to ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h diff --git a/ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.mk b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.mk rename to ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk diff --git a/ports/esp32s2/boards/atmegazero_esp32s2/pins.c b/ports/espressif/boards/atmegazero_esp32s2/pins.c similarity index 100% rename from ports/esp32s2/boards/atmegazero_esp32s2/pins.c rename to ports/espressif/boards/atmegazero_esp32s2/pins.c 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/crumpspace_crumps2/board.c b/ports/espressif/boards/crumpspace_crumps2/board.c similarity index 100% rename from ports/esp32s2/boards/crumpspace_crumps2/board.c rename to ports/espressif/boards/crumpspace_crumps2/board.c diff --git a/ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h rename to ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h diff --git a/ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.mk rename to ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk diff --git a/ports/esp32s2/boards/crumpspace_crumps2/pins.c b/ports/espressif/boards/crumpspace_crumps2/pins.c similarity index 100% rename from ports/esp32s2/boards/crumpspace_crumps2/pins.c rename to ports/espressif/boards/crumpspace_crumps2/pins.c diff --git a/ports/esp32s2/boards/crumpspace_crumps2/sdkconfig b/ports/espressif/boards/crumpspace_crumps2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/crumpspace_crumps2/sdkconfig rename to ports/espressif/boards/crumpspace_crumps2/sdkconfig diff --git a/ports/esp32s2/boards/electroniccats_bastwifi/board.c b/ports/espressif/boards/electroniccats_bastwifi/board.c similarity index 100% rename from ports/esp32s2/boards/electroniccats_bastwifi/board.c rename to ports/espressif/boards/electroniccats_bastwifi/board.c diff --git a/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h rename to ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h diff --git a/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.mk rename to ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk diff --git a/ports/esp32s2/boards/electroniccats_bastwifi/pins.c b/ports/espressif/boards/electroniccats_bastwifi/pins.c similarity index 100% rename from ports/esp32s2/boards/electroniccats_bastwifi/pins.c rename to ports/espressif/boards/electroniccats_bastwifi/pins.c diff --git a/ports/esp32s2/boards/electroniccats_bastwifi/sdkconfig b/ports/espressif/boards/electroniccats_bastwifi/sdkconfig similarity index 100% rename from ports/esp32s2/boards/electroniccats_bastwifi/sdkconfig rename to ports/espressif/boards/electroniccats_bastwifi/sdkconfig diff --git a/ports/esp32s2/boards/espressif_hmi_devkit_1/board.c b/ports/espressif/boards/espressif_hmi_devkit_1/board.c similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_devkit_1/board.c rename to ports/espressif/boards/espressif_hmi_devkit_1/board.c diff --git a/ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h rename to ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h diff --git a/ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.mk b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.mk rename to ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk diff --git a/ports/esp32s2/boards/espressif_hmi_devkit_1/pins.c b/ports/espressif/boards/espressif_hmi_devkit_1/pins.c similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_devkit_1/pins.c rename to ports/espressif/boards/espressif_hmi_devkit_1/pins.c diff --git a/ports/esp32s2/boards/espressif_hmi_devkit_1/sdkconfig b/ports/espressif/boards/espressif_hmi_devkit_1/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_hmi_devkit_1/sdkconfig rename to ports/espressif/boards/espressif_hmi_devkit_1/sdkconfig diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/board.c b/ports/espressif/boards/espressif_kaluga_1.3/board.c similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1.3/board.c rename to ports/espressif/boards/espressif_kaluga_1.3/board.c diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h rename to ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.mk rename to ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/pins.c b/ports/espressif/boards/espressif_kaluga_1.3/pins.c similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1.3/pins.c rename to ports/espressif/boards/espressif_kaluga_1.3/pins.c diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig b/ports/espressif/boards/espressif_kaluga_1.3/sdkconfig similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig rename to ports/espressif/boards/espressif_kaluga_1.3/sdkconfig diff --git a/ports/esp32s2/boards/espressif_kaluga_1/board.c b/ports/espressif/boards/espressif_kaluga_1/board.c similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1/board.c rename to ports/espressif/boards/espressif_kaluga_1/board.c diff --git a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h rename to ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h diff --git a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.mk rename to ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk diff --git a/ports/esp32s2/boards/espressif_kaluga_1/pins.c b/ports/espressif/boards/espressif_kaluga_1/pins.c similarity index 100% rename from ports/esp32s2/boards/espressif_kaluga_1/pins.c rename to ports/espressif/boards/espressif_kaluga_1/pins.c 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.c b/ports/espressif/boards/espressif_saola_1_wroom/board.c similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wroom/board.c rename to ports/espressif/boards/espressif_saola_1_wroom/board.c diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h rename to ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk rename to ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/pins.c b/ports/espressif/boards/espressif_saola_1_wroom/pins.c similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wroom/pins.c rename to ports/espressif/boards/espressif_saola_1_wroom/pins.c 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.c b/ports/espressif/boards/espressif_saola_1_wrover/board.c similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wrover/board.c rename to ports/espressif/boards/espressif_saola_1_wrover/board.c diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h rename to ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk rename to ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/pins.c b/ports/espressif/boards/espressif_saola_1_wrover/pins.c similarity index 100% rename from ports/esp32s2/boards/espressif_saola_1_wrover/pins.c rename to ports/espressif/boards/espressif_saola_1_wrover/pins.c 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/franzininho_wifi_wroom/board.c b/ports/espressif/boards/franzininho_wifi_wroom/board.c similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wroom/board.c rename to ports/espressif/boards/franzininho_wifi_wroom/board.c diff --git a/ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h rename to ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h diff --git a/ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.mk rename to ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk diff --git a/ports/esp32s2/boards/franzininho_wifi_wroom/pins.c b/ports/espressif/boards/franzininho_wifi_wroom/pins.c similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wroom/pins.c rename to ports/espressif/boards/franzininho_wifi_wroom/pins.c diff --git a/ports/esp32s2/boards/franzininho_wifi_wroom/sdkconfig b/ports/espressif/boards/franzininho_wifi_wroom/sdkconfig similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wroom/sdkconfig rename to ports/espressif/boards/franzininho_wifi_wroom/sdkconfig diff --git a/ports/esp32s2/boards/franzininho_wifi_wrover/board.c b/ports/espressif/boards/franzininho_wifi_wrover/board.c similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wrover/board.c rename to ports/espressif/boards/franzininho_wifi_wrover/board.c diff --git a/ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h rename to ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h diff --git a/ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.mk rename to ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk diff --git a/ports/esp32s2/boards/franzininho_wifi_wrover/pins.c b/ports/espressif/boards/franzininho_wifi_wrover/pins.c similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wrover/pins.c rename to ports/espressif/boards/franzininho_wifi_wrover/pins.c diff --git a/ports/esp32s2/boards/franzininho_wifi_wrover/sdkconfig b/ports/espressif/boards/franzininho_wifi_wrover/sdkconfig similarity index 100% rename from ports/esp32s2/boards/franzininho_wifi_wrover/sdkconfig rename to ports/espressif/boards/franzininho_wifi_wrover/sdkconfig diff --git a/ports/esp32s2/boards/gravitech_cucumber_m/board.c b/ports/espressif/boards/gravitech_cucumber_m/board.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_m/board.c rename to ports/espressif/boards/gravitech_cucumber_m/board.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.h rename to ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h diff --git a/ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.mk rename to ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk diff --git a/ports/esp32s2/boards/gravitech_cucumber_m/pins.c b/ports/espressif/boards/gravitech_cucumber_m/pins.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_m/pins.c rename to ports/espressif/boards/gravitech_cucumber_m/pins.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_m/sdkconfig b/ports/espressif/boards/gravitech_cucumber_m/sdkconfig similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_m/sdkconfig rename to ports/espressif/boards/gravitech_cucumber_m/sdkconfig diff --git a/ports/esp32s2/boards/gravitech_cucumber_ms/board.c b/ports/espressif/boards/gravitech_cucumber_ms/board.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_ms/board.c rename to ports/espressif/boards/gravitech_cucumber_ms/board.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.h rename to ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h diff --git a/ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.mk rename to ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk diff --git a/ports/esp32s2/boards/gravitech_cucumber_ms/pins.c b/ports/espressif/boards/gravitech_cucumber_ms/pins.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_ms/pins.c rename to ports/espressif/boards/gravitech_cucumber_ms/pins.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_ms/sdkconfig b/ports/espressif/boards/gravitech_cucumber_ms/sdkconfig similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_ms/sdkconfig rename to ports/espressif/boards/gravitech_cucumber_ms/sdkconfig diff --git a/ports/esp32s2/boards/gravitech_cucumber_r/board.c b/ports/espressif/boards/gravitech_cucumber_r/board.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_r/board.c rename to ports/espressif/boards/gravitech_cucumber_r/board.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h rename to ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h diff --git a/ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.mk rename to ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk diff --git a/ports/esp32s2/boards/gravitech_cucumber_r/pins.c b/ports/espressif/boards/gravitech_cucumber_r/pins.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_r/pins.c rename to ports/espressif/boards/gravitech_cucumber_r/pins.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_r/sdkconfig b/ports/espressif/boards/gravitech_cucumber_r/sdkconfig similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_r/sdkconfig rename to ports/espressif/boards/gravitech_cucumber_r/sdkconfig diff --git a/ports/esp32s2/boards/gravitech_cucumber_rs/board.c b/ports/espressif/boards/gravitech_cucumber_rs/board.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_rs/board.c rename to ports/espressif/boards/gravitech_cucumber_rs/board.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h rename to ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h diff --git a/ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.mk rename to ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk diff --git a/ports/esp32s2/boards/gravitech_cucumber_rs/pins.c b/ports/espressif/boards/gravitech_cucumber_rs/pins.c similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_rs/pins.c rename to ports/espressif/boards/gravitech_cucumber_rs/pins.c diff --git a/ports/esp32s2/boards/gravitech_cucumber_rs/sdkconfig b/ports/espressif/boards/gravitech_cucumber_rs/sdkconfig similarity index 100% rename from ports/esp32s2/boards/gravitech_cucumber_rs/sdkconfig rename to ports/espressif/boards/gravitech_cucumber_rs/sdkconfig diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/board.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c similarity index 100% rename from ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/board.c rename to ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h rename to ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk rename to ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/pins.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/pins.c similarity index 100% rename from ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/pins.c rename to ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/pins.c 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_mini/board.c b/ports/espressif/boards/lolin_s2_mini/board.c similarity index 100% rename from ports/esp32s2/boards/lolin_s2_mini/board.c rename to ports/espressif/boards/lolin_s2_mini/board.c diff --git a/ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h rename to ports/espressif/boards/lolin_s2_mini/mpconfigboard.h diff --git a/ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.mk rename to ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk diff --git a/ports/esp32s2/boards/lolin_s2_mini/pins.c b/ports/espressif/boards/lolin_s2_mini/pins.c similarity index 100% rename from ports/esp32s2/boards/lolin_s2_mini/pins.c rename to ports/espressif/boards/lolin_s2_mini/pins.c 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.c b/ports/espressif/boards/microdev_micro_s2/board.c similarity index 100% rename from ports/esp32s2/boards/microdev_micro_s2/board.c rename to ports/espressif/boards/microdev_micro_s2/board.c diff --git a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h rename to ports/espressif/boards/microdev_micro_s2/mpconfigboard.h diff --git a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk rename to ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk diff --git a/ports/esp32s2/boards/microdev_micro_s2/pins.c b/ports/espressif/boards/microdev_micro_s2/pins.c similarity index 100% rename from ports/esp32s2/boards/microdev_micro_s2/pins.c rename to ports/espressif/boards/microdev_micro_s2/pins.c 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.c b/ports/espressif/boards/morpheans_morphesp-240/board.c similarity index 100% rename from ports/esp32s2/boards/morpheans_morphesp-240/board.c rename to ports/espressif/boards/morpheans_morphesp-240/board.c diff --git a/ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h rename to ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h diff --git a/ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.mk rename to ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk diff --git a/ports/esp32s2/boards/morpheans_morphesp-240/pins.c b/ports/espressif/boards/morpheans_morphesp-240/pins.c similarity index 100% rename from ports/esp32s2/boards/morpheans_morphesp-240/pins.c rename to ports/espressif/boards/morpheans_morphesp-240/pins.c 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.c b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/board.c similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/board.c rename to ports/espressif/boards/muselab_nanoesp32_s2_wroom/board.c diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h rename to ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk rename to ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/pins.c b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/pins.c similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/pins.c rename to ports/espressif/boards/muselab_nanoesp32_s2_wroom/pins.c 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.c b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/board.c similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/board.c rename to ports/espressif/boards/muselab_nanoesp32_s2_wrover/board.c diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h rename to ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk rename to ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/pins.c b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/pins.c similarity index 100% rename from ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/pins.c rename to ports/espressif/boards/muselab_nanoesp32_s2_wrover/pins.c 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/odt_pixelwing_esp32_s2/board.c b/ports/espressif/boards/odt_pixelwing_esp32_s2/board.c similarity index 100% rename from ports/esp32s2/boards/odt_pixelwing_esp32_s2/board.c rename to ports/espressif/boards/odt_pixelwing_esp32_s2/board.c diff --git a/ports/esp32s2/boards/odt_pixelwing_esp32_s2/mpconfigboard.h b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/odt_pixelwing_esp32_s2/mpconfigboard.h rename to ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h diff --git a/ports/esp32s2/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk rename to ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk diff --git a/ports/esp32s2/boards/odt_pixelwing_esp32_s2/pins.c b/ports/espressif/boards/odt_pixelwing_esp32_s2/pins.c similarity index 100% rename from ports/esp32s2/boards/odt_pixelwing_esp32_s2/pins.c rename to ports/espressif/boards/odt_pixelwing_esp32_s2/pins.c diff --git a/ports/esp32s2/boards/odt_pixelwing_esp32_s2/sdkconfig b/ports/espressif/boards/odt_pixelwing_esp32_s2/sdkconfig similarity index 100% rename from ports/esp32s2/boards/odt_pixelwing_esp32_s2/sdkconfig rename to ports/espressif/boards/odt_pixelwing_esp32_s2/sdkconfig diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/board.c b/ports/espressif/boards/targett_module_clip_wroom/board.c similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wroom/board.c rename to ports/espressif/boards/targett_module_clip_wroom/board.c diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h rename to ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk rename to ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/pins.c b/ports/espressif/boards/targett_module_clip_wroom/pins.c similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wroom/pins.c rename to ports/espressif/boards/targett_module_clip_wroom/pins.c diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/sdkconfig b/ports/espressif/boards/targett_module_clip_wroom/sdkconfig similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wroom/sdkconfig rename to ports/espressif/boards/targett_module_clip_wroom/sdkconfig diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/board.c b/ports/espressif/boards/targett_module_clip_wrover/board.c similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wrover/board.c rename to ports/espressif/boards/targett_module_clip_wrover/board.c diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h rename to ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk rename to ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/pins.c b/ports/espressif/boards/targett_module_clip_wrover/pins.c similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wrover/pins.c rename to ports/espressif/boards/targett_module_clip_wrover/pins.c diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/sdkconfig b/ports/espressif/boards/targett_module_clip_wrover/sdkconfig similarity index 100% rename from ports/esp32s2/boards/targett_module_clip_wrover/sdkconfig rename to ports/espressif/boards/targett_module_clip_wrover/sdkconfig diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/board.c b/ports/espressif/boards/unexpectedmaker_feathers2/board.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2/board.c rename to ports/espressif/boards/unexpectedmaker_feathers2/board.c diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h rename to ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk rename to ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c b/ports/espressif/boards/unexpectedmaker_feathers2/pins.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c rename to ports/espressif/boards/unexpectedmaker_feathers2/pins.c 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.c b/ports/espressif/boards/unexpectedmaker_feathers2_neo/board.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_neo/board.c rename to ports/espressif/boards/unexpectedmaker_feathers2_neo/board.c diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h rename to ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk rename to ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_neo/pins.c b/ports/espressif/boards/unexpectedmaker_feathers2_neo/pins.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_neo/pins.c rename to ports/espressif/boards/unexpectedmaker_feathers2_neo/pins.c 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_feathers2_prerelease/board.c b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/board.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/board.c rename to ports/espressif/boards/unexpectedmaker_feathers2_prerelease/board.c diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h rename to ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk rename to ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/pins.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c rename to ports/espressif/boards/unexpectedmaker_feathers2_prerelease/pins.c diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/sdkconfig similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig rename to ports/espressif/boards/unexpectedmaker_feathers2_prerelease/sdkconfig diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/board.c b/ports/espressif/boards/unexpectedmaker_tinys2/board.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_tinys2/board.c rename to ports/espressif/boards/unexpectedmaker_tinys2/board.c diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h rename to ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.mk rename to ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/pins.c b/ports/espressif/boards/unexpectedmaker_tinys2/pins.c similarity index 100% rename from ports/esp32s2/boards/unexpectedmaker_tinys2/pins.c rename to ports/espressif/boards/unexpectedmaker_tinys2/pins.c 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/cam.c b/ports/espressif/cam.c similarity index 100% rename from ports/esp32s2/cam.c rename to ports/espressif/cam.c diff --git a/ports/esp32s2/cam.h b/ports/espressif/cam.h similarity index 100% rename from ports/esp32s2/cam.h rename to ports/espressif/cam.h diff --git a/ports/esp32s2/certificates/README.md b/ports/espressif/certificates/README.md similarity index 100% rename from ports/esp32s2/certificates/README.md rename to ports/espressif/certificates/README.md diff --git a/ports/esp32s2/certificates/nina-fw b/ports/espressif/certificates/nina-fw similarity index 100% rename from ports/esp32s2/certificates/nina-fw rename to ports/espressif/certificates/nina-fw diff --git a/ports/esp32s2/common-hal/alarm/SleepMemory.c b/ports/espressif/common-hal/alarm/SleepMemory.c similarity index 100% rename from ports/esp32s2/common-hal/alarm/SleepMemory.c rename to ports/espressif/common-hal/alarm/SleepMemory.c diff --git a/ports/esp32s2/common-hal/alarm/SleepMemory.h b/ports/espressif/common-hal/alarm/SleepMemory.h similarity index 100% rename from ports/esp32s2/common-hal/alarm/SleepMemory.h rename to ports/espressif/common-hal/alarm/SleepMemory.h diff --git a/ports/esp32s2/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/alarm/__init__.c rename to ports/espressif/common-hal/alarm/__init__.c diff --git a/ports/esp32s2/common-hal/alarm/__init__.h b/ports/espressif/common-hal/alarm/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/alarm/__init__.h rename to ports/espressif/common-hal/alarm/__init__.h diff --git a/ports/esp32s2/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c similarity index 100% rename from ports/esp32s2/common-hal/alarm/pin/PinAlarm.c rename to ports/espressif/common-hal/alarm/pin/PinAlarm.c diff --git a/ports/esp32s2/common-hal/alarm/pin/PinAlarm.h b/ports/espressif/common-hal/alarm/pin/PinAlarm.h similarity index 100% rename from ports/esp32s2/common-hal/alarm/pin/PinAlarm.h rename to ports/espressif/common-hal/alarm/pin/PinAlarm.h diff --git a/ports/esp32s2/common-hal/alarm/time/TimeAlarm.c b/ports/espressif/common-hal/alarm/time/TimeAlarm.c similarity index 100% rename from ports/esp32s2/common-hal/alarm/time/TimeAlarm.c rename to ports/espressif/common-hal/alarm/time/TimeAlarm.c diff --git a/ports/esp32s2/common-hal/alarm/time/TimeAlarm.h b/ports/espressif/common-hal/alarm/time/TimeAlarm.h similarity index 100% rename from ports/esp32s2/common-hal/alarm/time/TimeAlarm.h rename to ports/espressif/common-hal/alarm/time/TimeAlarm.h diff --git a/ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c similarity index 100% rename from ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c rename to ports/espressif/common-hal/alarm/touch/TouchAlarm.c diff --git a/ports/esp32s2/common-hal/alarm/touch/TouchAlarm.h b/ports/espressif/common-hal/alarm/touch/TouchAlarm.h similarity index 100% rename from ports/esp32s2/common-hal/alarm/touch/TouchAlarm.h rename to ports/espressif/common-hal/alarm/touch/TouchAlarm.h diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.c b/ports/espressif/common-hal/analogio/AnalogIn.c similarity index 100% rename from ports/esp32s2/common-hal/analogio/AnalogIn.c rename to ports/espressif/common-hal/analogio/AnalogIn.c diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.h b/ports/espressif/common-hal/analogio/AnalogIn.h similarity index 100% rename from ports/esp32s2/common-hal/analogio/AnalogIn.h rename to ports/espressif/common-hal/analogio/AnalogIn.h diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.c b/ports/espressif/common-hal/analogio/AnalogOut.c similarity index 100% rename from ports/esp32s2/common-hal/analogio/AnalogOut.c rename to ports/espressif/common-hal/analogio/AnalogOut.c diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.h b/ports/espressif/common-hal/analogio/AnalogOut.h similarity index 100% rename from ports/esp32s2/common-hal/analogio/AnalogOut.h rename to ports/espressif/common-hal/analogio/AnalogOut.h diff --git a/ports/esp32s2/common-hal/analogio/__init__.c b/ports/espressif/common-hal/analogio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/analogio/__init__.c rename to ports/espressif/common-hal/analogio/__init__.c diff --git a/ports/esp32s2/common-hal/audiobusio/I2SOut.c b/ports/espressif/common-hal/audiobusio/I2SOut.c similarity index 100% rename from ports/esp32s2/common-hal/audiobusio/I2SOut.c rename to ports/espressif/common-hal/audiobusio/I2SOut.c diff --git a/ports/esp32s2/common-hal/audiobusio/I2SOut.h b/ports/espressif/common-hal/audiobusio/I2SOut.h similarity index 100% rename from ports/esp32s2/common-hal/audiobusio/I2SOut.h rename to ports/espressif/common-hal/audiobusio/I2SOut.h diff --git a/ports/esp32s2/common-hal/audiobusio/PDMIn.c b/ports/espressif/common-hal/audiobusio/PDMIn.c similarity index 100% rename from ports/esp32s2/common-hal/audiobusio/PDMIn.c rename to ports/espressif/common-hal/audiobusio/PDMIn.c diff --git a/ports/esp32s2/common-hal/audiobusio/PDMIn.h b/ports/espressif/common-hal/audiobusio/PDMIn.h similarity index 100% rename from ports/esp32s2/common-hal/audiobusio/PDMIn.h rename to ports/espressif/common-hal/audiobusio/PDMIn.h diff --git a/ports/esp32s2/common-hal/audiobusio/__init__.c b/ports/espressif/common-hal/audiobusio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/audiobusio/__init__.c rename to ports/espressif/common-hal/audiobusio/__init__.c diff --git a/ports/esp32s2/common-hal/audiobusio/__init__.h b/ports/espressif/common-hal/audiobusio/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/audiobusio/__init__.h rename to ports/espressif/common-hal/audiobusio/__init__.h diff --git a/ports/esp32s2/common-hal/board/__init__.c b/ports/espressif/common-hal/board/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/board/__init__.c rename to ports/espressif/common-hal/board/__init__.c diff --git a/ports/esp32s2/common-hal/busio/I2C.c b/ports/espressif/common-hal/busio/I2C.c similarity index 100% rename from ports/esp32s2/common-hal/busio/I2C.c rename to ports/espressif/common-hal/busio/I2C.c diff --git a/ports/esp32s2/common-hal/busio/I2C.h b/ports/espressif/common-hal/busio/I2C.h similarity index 100% rename from ports/esp32s2/common-hal/busio/I2C.h rename to ports/espressif/common-hal/busio/I2C.h diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/espressif/common-hal/busio/SPI.c similarity index 100% rename from ports/esp32s2/common-hal/busio/SPI.c rename to ports/espressif/common-hal/busio/SPI.c diff --git a/ports/esp32s2/common-hal/busio/SPI.h b/ports/espressif/common-hal/busio/SPI.h similarity index 100% rename from ports/esp32s2/common-hal/busio/SPI.h rename to ports/espressif/common-hal/busio/SPI.h diff --git a/ports/esp32s2/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c similarity index 100% rename from ports/esp32s2/common-hal/busio/UART.c rename to ports/espressif/common-hal/busio/UART.c diff --git a/ports/esp32s2/common-hal/busio/UART.h b/ports/espressif/common-hal/busio/UART.h similarity index 100% rename from ports/esp32s2/common-hal/busio/UART.h rename to ports/espressif/common-hal/busio/UART.h diff --git a/ports/esp32s2/common-hal/busio/__init__.c b/ports/espressif/common-hal/busio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/busio/__init__.c rename to ports/espressif/common-hal/busio/__init__.c diff --git a/ports/esp32s2/common-hal/canio/CAN.c b/ports/espressif/common-hal/canio/CAN.c similarity index 100% rename from ports/esp32s2/common-hal/canio/CAN.c rename to ports/espressif/common-hal/canio/CAN.c diff --git a/ports/esp32s2/common-hal/canio/CAN.h b/ports/espressif/common-hal/canio/CAN.h similarity index 100% rename from ports/esp32s2/common-hal/canio/CAN.h rename to ports/espressif/common-hal/canio/CAN.h diff --git a/ports/esp32s2/common-hal/canio/Listener.c b/ports/espressif/common-hal/canio/Listener.c similarity index 100% rename from ports/esp32s2/common-hal/canio/Listener.c rename to ports/espressif/common-hal/canio/Listener.c diff --git a/ports/esp32s2/common-hal/canio/Listener.h b/ports/espressif/common-hal/canio/Listener.h similarity index 100% rename from ports/esp32s2/common-hal/canio/Listener.h rename to ports/espressif/common-hal/canio/Listener.h diff --git a/ports/esp32s2/common-hal/canio/__init__.c b/ports/espressif/common-hal/canio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/canio/__init__.c rename to ports/espressif/common-hal/canio/__init__.c diff --git a/ports/esp32s2/common-hal/canio/__init__.h b/ports/espressif/common-hal/canio/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/canio/__init__.h rename to ports/espressif/common-hal/canio/__init__.h diff --git a/ports/esp32s2/common-hal/countio/Counter.c b/ports/espressif/common-hal/countio/Counter.c similarity index 100% rename from ports/esp32s2/common-hal/countio/Counter.c rename to ports/espressif/common-hal/countio/Counter.c diff --git a/ports/esp32s2/common-hal/countio/Counter.h b/ports/espressif/common-hal/countio/Counter.h similarity index 100% rename from ports/esp32s2/common-hal/countio/Counter.h rename to ports/espressif/common-hal/countio/Counter.h diff --git a/ports/esp32s2/common-hal/countio/__init__.c b/ports/espressif/common-hal/countio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/countio/__init__.c rename to ports/espressif/common-hal/countio/__init__.c diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c similarity index 100% rename from ports/esp32s2/common-hal/digitalio/DigitalInOut.c rename to ports/espressif/common-hal/digitalio/DigitalInOut.c diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.h b/ports/espressif/common-hal/digitalio/DigitalInOut.h similarity index 100% rename from ports/esp32s2/common-hal/digitalio/DigitalInOut.h rename to ports/espressif/common-hal/digitalio/DigitalInOut.h diff --git a/ports/esp32s2/common-hal/digitalio/__init__.c b/ports/espressif/common-hal/digitalio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/digitalio/__init__.c rename to ports/espressif/common-hal/digitalio/__init__.c diff --git a/ports/esp32s2/common-hal/dualbank/__init__.c b/ports/espressif/common-hal/dualbank/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/dualbank/__init__.c rename to ports/espressif/common-hal/dualbank/__init__.c diff --git a/ports/esp32s2/common-hal/dualbank/__init__.h b/ports/espressif/common-hal/dualbank/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/dualbank/__init__.h rename to ports/espressif/common-hal/dualbank/__init__.h diff --git a/ports/esp32s2/common-hal/frequencyio/FrequencyIn.c b/ports/espressif/common-hal/frequencyio/FrequencyIn.c similarity index 100% rename from ports/esp32s2/common-hal/frequencyio/FrequencyIn.c rename to ports/espressif/common-hal/frequencyio/FrequencyIn.c diff --git a/ports/esp32s2/common-hal/frequencyio/FrequencyIn.h b/ports/espressif/common-hal/frequencyio/FrequencyIn.h similarity index 100% rename from ports/esp32s2/common-hal/frequencyio/FrequencyIn.h rename to ports/espressif/common-hal/frequencyio/FrequencyIn.h diff --git a/ports/esp32s2/common-hal/frequencyio/__init__.c b/ports/espressif/common-hal/frequencyio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/frequencyio/__init__.c rename to ports/espressif/common-hal/frequencyio/__init__.c diff --git a/ports/esp32s2/common-hal/imagecapture/ParallelImageCapture.c b/ports/espressif/common-hal/imagecapture/ParallelImageCapture.c similarity index 100% rename from ports/esp32s2/common-hal/imagecapture/ParallelImageCapture.c rename to ports/espressif/common-hal/imagecapture/ParallelImageCapture.c diff --git a/ports/esp32s2/common-hal/imagecapture/ParallelImageCapture.h b/ports/espressif/common-hal/imagecapture/ParallelImageCapture.h similarity index 100% rename from ports/esp32s2/common-hal/imagecapture/ParallelImageCapture.h rename to ports/espressif/common-hal/imagecapture/ParallelImageCapture.h diff --git a/ports/esp32s2/common-hal/imagecapture/__init__.c b/ports/espressif/common-hal/imagecapture/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/imagecapture/__init__.c rename to ports/espressif/common-hal/imagecapture/__init__.c diff --git a/ports/esp32s2/common-hal/imagecapture/__init__.h b/ports/espressif/common-hal/imagecapture/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/imagecapture/__init__.h rename to ports/espressif/common-hal/imagecapture/__init__.h diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c similarity index 100% rename from ports/esp32s2/common-hal/microcontroller/Pin.c rename to ports/espressif/common-hal/microcontroller/Pin.c diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.h b/ports/espressif/common-hal/microcontroller/Pin.h similarity index 100% rename from ports/esp32s2/common-hal/microcontroller/Pin.h rename to ports/espressif/common-hal/microcontroller/Pin.h diff --git a/ports/esp32s2/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c similarity index 100% rename from ports/esp32s2/common-hal/microcontroller/Processor.c rename to ports/espressif/common-hal/microcontroller/Processor.c diff --git a/ports/esp32s2/common-hal/microcontroller/Processor.h b/ports/espressif/common-hal/microcontroller/Processor.h similarity index 100% rename from ports/esp32s2/common-hal/microcontroller/Processor.h rename to ports/espressif/common-hal/microcontroller/Processor.h diff --git a/ports/esp32s2/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/microcontroller/__init__.c rename to ports/espressif/common-hal/microcontroller/__init__.c diff --git a/ports/esp32s2/common-hal/neopixel_write/__init__.c b/ports/espressif/common-hal/neopixel_write/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/neopixel_write/__init__.c rename to ports/espressif/common-hal/neopixel_write/__init__.c diff --git a/ports/esp32s2/common-hal/nvm/ByteArray.c b/ports/espressif/common-hal/nvm/ByteArray.c similarity index 100% rename from ports/esp32s2/common-hal/nvm/ByteArray.c rename to ports/espressif/common-hal/nvm/ByteArray.c diff --git a/ports/esp32s2/common-hal/nvm/ByteArray.h b/ports/espressif/common-hal/nvm/ByteArray.h similarity index 100% rename from ports/esp32s2/common-hal/nvm/ByteArray.h rename to ports/espressif/common-hal/nvm/ByteArray.h diff --git a/ports/esp32s2/common-hal/nvm/__init__.c b/ports/espressif/common-hal/nvm/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/nvm/__init__.c rename to ports/espressif/common-hal/nvm/__init__.c diff --git a/ports/esp32s2/common-hal/os/__init__.c b/ports/espressif/common-hal/os/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/os/__init__.c rename to ports/espressif/common-hal/os/__init__.c diff --git a/ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c b/ports/espressif/common-hal/paralleldisplay/ParallelBus.c similarity index 100% rename from ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c rename to ports/espressif/common-hal/paralleldisplay/ParallelBus.c diff --git a/ports/esp32s2/common-hal/paralleldisplay/ParallelBus.h b/ports/espressif/common-hal/paralleldisplay/ParallelBus.h similarity index 100% rename from ports/esp32s2/common-hal/paralleldisplay/ParallelBus.h rename to ports/espressif/common-hal/paralleldisplay/ParallelBus.h diff --git a/ports/esp32s2/common-hal/ps2io/Ps2.c b/ports/espressif/common-hal/ps2io/Ps2.c similarity index 100% rename from ports/esp32s2/common-hal/ps2io/Ps2.c rename to ports/espressif/common-hal/ps2io/Ps2.c diff --git a/ports/esp32s2/common-hal/ps2io/Ps2.h b/ports/espressif/common-hal/ps2io/Ps2.h similarity index 100% rename from ports/esp32s2/common-hal/ps2io/Ps2.h rename to ports/espressif/common-hal/ps2io/Ps2.h diff --git a/ports/esp32s2/common-hal/ps2io/__init__.c b/ports/espressif/common-hal/ps2io/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/ps2io/__init__.c rename to ports/espressif/common-hal/ps2io/__init__.c diff --git a/ports/esp32s2/common-hal/pulseio/PulseIn.c b/ports/espressif/common-hal/pulseio/PulseIn.c similarity index 100% rename from ports/esp32s2/common-hal/pulseio/PulseIn.c rename to ports/espressif/common-hal/pulseio/PulseIn.c diff --git a/ports/esp32s2/common-hal/pulseio/PulseIn.h b/ports/espressif/common-hal/pulseio/PulseIn.h similarity index 100% rename from ports/esp32s2/common-hal/pulseio/PulseIn.h rename to ports/espressif/common-hal/pulseio/PulseIn.h diff --git a/ports/esp32s2/common-hal/pulseio/PulseOut.c b/ports/espressif/common-hal/pulseio/PulseOut.c similarity index 100% rename from ports/esp32s2/common-hal/pulseio/PulseOut.c rename to ports/espressif/common-hal/pulseio/PulseOut.c diff --git a/ports/esp32s2/common-hal/pulseio/PulseOut.h b/ports/espressif/common-hal/pulseio/PulseOut.h similarity index 100% rename from ports/esp32s2/common-hal/pulseio/PulseOut.h rename to ports/espressif/common-hal/pulseio/PulseOut.h diff --git a/ports/esp32s2/common-hal/pulseio/__init__.c b/ports/espressif/common-hal/pulseio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/pulseio/__init__.c rename to ports/espressif/common-hal/pulseio/__init__.c diff --git a/ports/esp32s2/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c similarity index 100% rename from ports/esp32s2/common-hal/pwmio/PWMOut.c rename to ports/espressif/common-hal/pwmio/PWMOut.c diff --git a/ports/esp32s2/common-hal/pwmio/PWMOut.h b/ports/espressif/common-hal/pwmio/PWMOut.h similarity index 100% rename from ports/esp32s2/common-hal/pwmio/PWMOut.h rename to ports/espressif/common-hal/pwmio/PWMOut.h diff --git a/ports/esp32s2/common-hal/pwmio/__init__.c b/ports/espressif/common-hal/pwmio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/pwmio/__init__.c rename to ports/espressif/common-hal/pwmio/__init__.c diff --git a/ports/esp32s2/common-hal/rgbmatrix/RGBMatrix.c b/ports/espressif/common-hal/rgbmatrix/RGBMatrix.c similarity index 100% rename from ports/esp32s2/common-hal/rgbmatrix/RGBMatrix.c rename to ports/espressif/common-hal/rgbmatrix/RGBMatrix.c diff --git a/ports/esp32s2/common-hal/rgbmatrix/RGBMatrix.h b/ports/espressif/common-hal/rgbmatrix/RGBMatrix.h similarity index 100% rename from ports/esp32s2/common-hal/rgbmatrix/RGBMatrix.h rename to ports/espressif/common-hal/rgbmatrix/RGBMatrix.h diff --git a/ports/esp32s2/common-hal/rgbmatrix/__init__.c b/ports/espressif/common-hal/rgbmatrix/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/rgbmatrix/__init__.c rename to ports/espressif/common-hal/rgbmatrix/__init__.c diff --git a/ports/esp32s2/common-hal/rgbmatrix/__init__.h b/ports/espressif/common-hal/rgbmatrix/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/rgbmatrix/__init__.h rename to ports/espressif/common-hal/rgbmatrix/__init__.h diff --git a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.c similarity index 100% rename from ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c rename to ports/espressif/common-hal/rotaryio/IncrementalEncoder.c diff --git a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h b/ports/espressif/common-hal/rotaryio/IncrementalEncoder.h similarity index 100% rename from ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h rename to ports/espressif/common-hal/rotaryio/IncrementalEncoder.h diff --git a/ports/esp32s2/common-hal/rotaryio/__init__.c b/ports/espressif/common-hal/rotaryio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/rotaryio/__init__.c rename to ports/espressif/common-hal/rotaryio/__init__.c diff --git a/ports/esp32s2/common-hal/rtc/RTC.c b/ports/espressif/common-hal/rtc/RTC.c similarity index 100% rename from ports/esp32s2/common-hal/rtc/RTC.c rename to ports/espressif/common-hal/rtc/RTC.c diff --git a/ports/esp32s2/common-hal/rtc/RTC.h b/ports/espressif/common-hal/rtc/RTC.h similarity index 100% rename from ports/esp32s2/common-hal/rtc/RTC.h rename to ports/espressif/common-hal/rtc/RTC.h diff --git a/ports/esp32s2/common-hal/rtc/__init__.c b/ports/espressif/common-hal/rtc/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/rtc/__init__.c rename to ports/espressif/common-hal/rtc/__init__.c diff --git a/ports/esp32s2/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c similarity index 100% rename from ports/esp32s2/common-hal/socketpool/Socket.c rename to ports/espressif/common-hal/socketpool/Socket.c diff --git a/ports/esp32s2/common-hal/socketpool/Socket.h b/ports/espressif/common-hal/socketpool/Socket.h similarity index 100% rename from ports/esp32s2/common-hal/socketpool/Socket.h rename to ports/espressif/common-hal/socketpool/Socket.h diff --git a/ports/esp32s2/common-hal/socketpool/SocketPool.c b/ports/espressif/common-hal/socketpool/SocketPool.c similarity index 100% rename from ports/esp32s2/common-hal/socketpool/SocketPool.c rename to ports/espressif/common-hal/socketpool/SocketPool.c diff --git a/ports/esp32s2/common-hal/socketpool/SocketPool.h b/ports/espressif/common-hal/socketpool/SocketPool.h similarity index 100% rename from ports/esp32s2/common-hal/socketpool/SocketPool.h rename to ports/espressif/common-hal/socketpool/SocketPool.h diff --git a/ports/esp32s2/common-hal/socketpool/__init__.c b/ports/espressif/common-hal/socketpool/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/socketpool/__init__.c rename to ports/espressif/common-hal/socketpool/__init__.c diff --git a/ports/esp32s2/common-hal/socketpool/__init__.h b/ports/espressif/common-hal/socketpool/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/socketpool/__init__.h rename to ports/espressif/common-hal/socketpool/__init__.h diff --git a/ports/esp32s2/common-hal/ssl/SSLContext.c b/ports/espressif/common-hal/ssl/SSLContext.c similarity index 100% rename from ports/esp32s2/common-hal/ssl/SSLContext.c rename to ports/espressif/common-hal/ssl/SSLContext.c diff --git a/ports/esp32s2/common-hal/ssl/SSLContext.h b/ports/espressif/common-hal/ssl/SSLContext.h similarity index 100% rename from ports/esp32s2/common-hal/ssl/SSLContext.h rename to ports/espressif/common-hal/ssl/SSLContext.h diff --git a/ports/esp32s2/common-hal/ssl/SSLSocket.c b/ports/espressif/common-hal/ssl/SSLSocket.c similarity index 100% rename from ports/esp32s2/common-hal/ssl/SSLSocket.c rename to ports/espressif/common-hal/ssl/SSLSocket.c diff --git a/ports/esp32s2/common-hal/ssl/SSLSocket.h b/ports/espressif/common-hal/ssl/SSLSocket.h similarity index 100% rename from ports/esp32s2/common-hal/ssl/SSLSocket.h rename to ports/espressif/common-hal/ssl/SSLSocket.h diff --git a/ports/esp32s2/common-hal/ssl/__init__.c b/ports/espressif/common-hal/ssl/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/ssl/__init__.c rename to ports/espressif/common-hal/ssl/__init__.c diff --git a/ports/esp32s2/common-hal/ssl/__init__.h b/ports/espressif/common-hal/ssl/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/ssl/__init__.h rename to ports/espressif/common-hal/ssl/__init__.h diff --git a/ports/esp32s2/common-hal/supervisor/Runtime.c b/ports/espressif/common-hal/supervisor/Runtime.c similarity index 100% rename from ports/esp32s2/common-hal/supervisor/Runtime.c rename to ports/espressif/common-hal/supervisor/Runtime.c diff --git a/ports/esp32s2/common-hal/supervisor/Runtime.h b/ports/espressif/common-hal/supervisor/Runtime.h similarity index 100% rename from ports/esp32s2/common-hal/supervisor/Runtime.h rename to ports/espressif/common-hal/supervisor/Runtime.h diff --git a/ports/esp32s2/common-hal/supervisor/__init__.c b/ports/espressif/common-hal/supervisor/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/supervisor/__init__.c rename to ports/espressif/common-hal/supervisor/__init__.c diff --git a/ports/esp32s2/common-hal/time/__init__.c b/ports/espressif/common-hal/time/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/time/__init__.c rename to ports/espressif/common-hal/time/__init__.c diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.c b/ports/espressif/common-hal/touchio/TouchIn.c similarity index 100% rename from ports/esp32s2/common-hal/touchio/TouchIn.c rename to ports/espressif/common-hal/touchio/TouchIn.c diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.h b/ports/espressif/common-hal/touchio/TouchIn.h similarity index 100% rename from ports/esp32s2/common-hal/touchio/TouchIn.h rename to ports/espressif/common-hal/touchio/TouchIn.h diff --git a/ports/esp32s2/common-hal/touchio/__init__.c b/ports/espressif/common-hal/touchio/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/touchio/__init__.c rename to ports/espressif/common-hal/touchio/__init__.c diff --git a/ports/esp32s2/common-hal/watchdog/WatchDogMode.c b/ports/espressif/common-hal/watchdog/WatchDogMode.c similarity index 100% rename from ports/esp32s2/common-hal/watchdog/WatchDogMode.c rename to ports/espressif/common-hal/watchdog/WatchDogMode.c diff --git a/ports/esp32s2/common-hal/watchdog/WatchDogTimer.c b/ports/espressif/common-hal/watchdog/WatchDogTimer.c similarity index 100% rename from ports/esp32s2/common-hal/watchdog/WatchDogTimer.c rename to ports/espressif/common-hal/watchdog/WatchDogTimer.c diff --git a/ports/esp32s2/common-hal/watchdog/WatchDogTimer.h b/ports/espressif/common-hal/watchdog/WatchDogTimer.h similarity index 100% rename from ports/esp32s2/common-hal/watchdog/WatchDogTimer.h rename to ports/espressif/common-hal/watchdog/WatchDogTimer.h diff --git a/ports/esp32s2/common-hal/watchdog/__init__.c b/ports/espressif/common-hal/watchdog/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/watchdog/__init__.c rename to ports/espressif/common-hal/watchdog/__init__.c diff --git a/ports/esp32s2/common-hal/wifi/Network.c b/ports/espressif/common-hal/wifi/Network.c similarity index 100% rename from ports/esp32s2/common-hal/wifi/Network.c rename to ports/espressif/common-hal/wifi/Network.c diff --git a/ports/esp32s2/common-hal/wifi/Network.h b/ports/espressif/common-hal/wifi/Network.h similarity index 100% rename from ports/esp32s2/common-hal/wifi/Network.h rename to ports/espressif/common-hal/wifi/Network.h diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c similarity index 100% rename from ports/esp32s2/common-hal/wifi/Radio.c rename to ports/espressif/common-hal/wifi/Radio.c diff --git a/ports/esp32s2/common-hal/wifi/Radio.h b/ports/espressif/common-hal/wifi/Radio.h similarity index 100% rename from ports/esp32s2/common-hal/wifi/Radio.h rename to ports/espressif/common-hal/wifi/Radio.h diff --git a/ports/esp32s2/common-hal/wifi/ScannedNetworks.c b/ports/espressif/common-hal/wifi/ScannedNetworks.c similarity index 100% rename from ports/esp32s2/common-hal/wifi/ScannedNetworks.c rename to ports/espressif/common-hal/wifi/ScannedNetworks.c diff --git a/ports/esp32s2/common-hal/wifi/ScannedNetworks.h b/ports/espressif/common-hal/wifi/ScannedNetworks.h similarity index 100% rename from ports/esp32s2/common-hal/wifi/ScannedNetworks.h rename to ports/espressif/common-hal/wifi/ScannedNetworks.h diff --git a/ports/esp32s2/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c similarity index 100% rename from ports/esp32s2/common-hal/wifi/__init__.c rename to ports/espressif/common-hal/wifi/__init__.c diff --git a/ports/esp32s2/common-hal/wifi/__init__.h b/ports/espressif/common-hal/wifi/__init__.h similarity index 100% rename from ports/esp32s2/common-hal/wifi/__init__.h rename to ports/espressif/common-hal/wifi/__init__.h diff --git a/ports/esp32s2/esp-idf b/ports/espressif/esp-idf similarity index 100% rename from ports/esp32s2/esp-idf rename to ports/espressif/esp-idf diff --git a/ports/esp32s2/esp-idf-config/partitions-16MB.csv b/ports/espressif/esp-idf-config/partitions-16MB.csv similarity index 100% rename from ports/esp32s2/esp-idf-config/partitions-16MB.csv rename to ports/espressif/esp-idf-config/partitions-16MB.csv diff --git a/ports/esp32s2/esp-idf-config/partitions-4MB.csv b/ports/espressif/esp-idf-config/partitions-4MB.csv similarity index 100% rename from ports/esp32s2/esp-idf-config/partitions-4MB.csv rename to ports/espressif/esp-idf-config/partitions-4MB.csv diff --git a/ports/esp32s2/esp-idf-config/partitions-8MB.csv b/ports/espressif/esp-idf-config/partitions-8MB.csv similarity index 100% rename from ports/esp32s2/esp-idf-config/partitions-8MB.csv rename to ports/espressif/esp-idf-config/partitions-8MB.csv diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-16MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-16MB.defaults similarity index 100% rename from ports/esp32s2/esp-idf-config/sdkconfig-16MB.defaults rename to ports/espressif/esp-idf-config/sdkconfig-16MB.defaults diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-4MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-4MB.defaults similarity index 100% rename from ports/esp32s2/esp-idf-config/sdkconfig-4MB.defaults rename to ports/espressif/esp-idf-config/sdkconfig-4MB.defaults diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-8MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults similarity index 100% rename from ports/esp32s2/esp-idf-config/sdkconfig-8MB.defaults rename to ports/espressif/esp-idf-config/sdkconfig-8MB.defaults diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-debug.defaults b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults similarity index 100% rename from ports/esp32s2/esp-idf-config/sdkconfig-debug.defaults rename to ports/espressif/esp-idf-config/sdkconfig-debug.defaults diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults similarity index 100% rename from ports/esp32s2/esp-idf-config/sdkconfig-opt.defaults rename to ports/espressif/esp-idf-config/sdkconfig-opt.defaults diff --git a/ports/esp32s2/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults similarity index 100% rename from ports/esp32s2/esp-idf-config/sdkconfig.defaults rename to ports/espressif/esp-idf-config/sdkconfig.defaults diff --git a/ports/esp32s2/esp32s2_peripherals_config.h b/ports/espressif/esp32s2_peripherals_config.h similarity index 100% rename from ports/esp32s2/esp32s2_peripherals_config.h rename to ports/espressif/esp32s2_peripherals_config.h diff --git a/ports/esp32s2/esp_error.c b/ports/espressif/esp_error.c similarity index 100% rename from ports/esp32s2/esp_error.c rename to ports/espressif/esp_error.c diff --git a/ports/esp32s2/fatfs_port.c b/ports/espressif/fatfs_port.c similarity index 100% rename from ports/esp32s2/fatfs_port.c rename to ports/espressif/fatfs_port.c diff --git a/ports/esp32s2/modules/module.h b/ports/espressif/modules/module.h similarity index 100% rename from ports/esp32s2/modules/module.h rename to ports/espressif/modules/module.h diff --git a/ports/esp32s2/modules/none.c b/ports/espressif/modules/none.c similarity index 100% rename from ports/esp32s2/modules/none.c rename to ports/espressif/modules/none.c diff --git a/ports/esp32s2/modules/wroom.c b/ports/espressif/modules/wroom.c similarity index 100% rename from ports/esp32s2/modules/wroom.c rename to ports/espressif/modules/wroom.c diff --git a/ports/esp32s2/modules/wrover.c b/ports/espressif/modules/wrover.c similarity index 100% rename from ports/esp32s2/modules/wrover.c rename to ports/espressif/modules/wrover.c diff --git a/ports/esp32s2/mpconfigport.h b/ports/espressif/mpconfigport.h similarity index 100% rename from ports/esp32s2/mpconfigport.h rename to ports/espressif/mpconfigport.h diff --git a/ports/esp32s2/mpconfigport.mk b/ports/espressif/mpconfigport.mk similarity index 100% rename from ports/esp32s2/mpconfigport.mk rename to ports/espressif/mpconfigport.mk diff --git a/ports/esp32s2/mphalport.c b/ports/espressif/mphalport.c similarity index 100% rename from ports/esp32s2/mphalport.c rename to ports/espressif/mphalport.c diff --git a/ports/esp32s2/mphalport.h b/ports/espressif/mphalport.h similarity index 100% rename from ports/esp32s2/mphalport.h rename to ports/espressif/mphalport.h diff --git a/ports/esp32s2/peripherals/pcnt.c b/ports/espressif/peripherals/pcnt.c similarity index 100% rename from ports/esp32s2/peripherals/pcnt.c rename to ports/espressif/peripherals/pcnt.c diff --git a/ports/esp32s2/peripherals/pcnt.h b/ports/espressif/peripherals/pcnt.h similarity index 100% rename from ports/esp32s2/peripherals/pcnt.h rename to ports/espressif/peripherals/pcnt.h diff --git a/ports/esp32s2/peripherals/pins.c b/ports/espressif/peripherals/pins.c similarity index 100% rename from ports/esp32s2/peripherals/pins.c rename to ports/espressif/peripherals/pins.c diff --git a/ports/esp32s2/peripherals/pins.h b/ports/espressif/peripherals/pins.h similarity index 100% rename from ports/esp32s2/peripherals/pins.h rename to ports/espressif/peripherals/pins.h diff --git a/ports/esp32s2/peripherals/rmt.c b/ports/espressif/peripherals/rmt.c similarity index 100% rename from ports/esp32s2/peripherals/rmt.c rename to ports/espressif/peripherals/rmt.c diff --git a/ports/esp32s2/peripherals/rmt.h b/ports/espressif/peripherals/rmt.h similarity index 100% rename from ports/esp32s2/peripherals/rmt.h rename to ports/espressif/peripherals/rmt.h diff --git a/ports/esp32s2/peripherals/timer.c b/ports/espressif/peripherals/timer.c similarity index 100% rename from ports/esp32s2/peripherals/timer.c rename to ports/espressif/peripherals/timer.c diff --git a/ports/esp32s2/peripherals/timer.h b/ports/espressif/peripherals/timer.h similarity index 100% rename from ports/esp32s2/peripherals/timer.h rename to ports/espressif/peripherals/timer.h diff --git a/ports/esp32s2/peripherals/touch.c b/ports/espressif/peripherals/touch.c similarity index 100% rename from ports/esp32s2/peripherals/touch.c rename to ports/espressif/peripherals/touch.c diff --git a/ports/esp32s2/peripherals/touch.h b/ports/espressif/peripherals/touch.h similarity index 100% rename from ports/esp32s2/peripherals/touch.h rename to ports/espressif/peripherals/touch.h diff --git a/ports/esp32s2/qstrdefsport.h b/ports/espressif/qstrdefsport.h similarity index 100% rename from ports/esp32s2/qstrdefsport.h rename to ports/espressif/qstrdefsport.h diff --git a/ports/esp32s2/supervisor/esp_port.h b/ports/espressif/supervisor/esp_port.h similarity index 100% rename from ports/esp32s2/supervisor/esp_port.h rename to ports/espressif/supervisor/esp_port.h diff --git a/ports/esp32s2/supervisor/internal_flash.c b/ports/espressif/supervisor/internal_flash.c similarity index 100% rename from ports/esp32s2/supervisor/internal_flash.c rename to ports/espressif/supervisor/internal_flash.c diff --git a/ports/esp32s2/supervisor/internal_flash.h b/ports/espressif/supervisor/internal_flash.h similarity index 100% rename from ports/esp32s2/supervisor/internal_flash.h rename to ports/espressif/supervisor/internal_flash.h diff --git a/ports/esp32s2/supervisor/internal_flash_root_pointers.h b/ports/espressif/supervisor/internal_flash_root_pointers.h similarity index 100% rename from ports/esp32s2/supervisor/internal_flash_root_pointers.h rename to ports/espressif/supervisor/internal_flash_root_pointers.h diff --git a/ports/esp32s2/supervisor/port.c b/ports/espressif/supervisor/port.c similarity index 100% rename from ports/esp32s2/supervisor/port.c rename to ports/espressif/supervisor/port.c diff --git a/ports/esp32s2/supervisor/usb.c b/ports/espressif/supervisor/usb.c similarity index 100% rename from ports/esp32s2/supervisor/usb.c rename to ports/espressif/supervisor/usb.c diff --git a/ports/esp32s2/tools/build_memory_info.py b/ports/espressif/tools/build_memory_info.py similarity index 100% rename from ports/esp32s2/tools/build_memory_info.py rename to ports/espressif/tools/build_memory_info.py diff --git a/ports/esp32s2/tools/decode_backtrace.py b/ports/espressif/tools/decode_backtrace.py similarity index 100% rename from ports/esp32s2/tools/decode_backtrace.py rename to ports/espressif/tools/decode_backtrace.py diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 763fdf37b8..51e6fb8a11 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -185,7 +185,7 @@ CFLAGS += -DCIRCUITPY_ENABLE_MPY_NATIVE=$(CIRCUITPY_ENABLE_MPY_NATIVE) CIRCUITPY_ERRNO ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO) -# CIRCUITPY_ESPIDF is handled in the esp32s2 tree. +# CIRCUITPY_ESPIDF is handled in the espressif tree. # Only for ESP32S chips. # Assume not a ESP build. CIRCUITPY_ESPIDF ?= 0 diff --git a/tools/build_board_info.py b/tools/build_board_info.py index eed136c545..de25015dd0 100644 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -40,7 +40,7 @@ extension_by_port = { "cxd56": SPK, "mimxrt10xx": HEX_UF2, "litex": DFU, - "esp32s2": BIN_UF2, + "espressif": BIN_UF2, "raspberrypi": UF2, } diff --git a/tools/ci.sh b/tools/ci.sh deleted file mode 100755 index 3039573322..0000000000 --- a/tools/ci.sh +++ /dev/null @@ -1,584 +0,0 @@ -#!/bin/bash - -if which nproc > /dev/null; then - MAKEOPTS="-j$(nproc)" -else - MAKEOPTS="-j$(sysctl -n hw.ncpu)" -fi - -######################################################################################## -# general helper functions - -function ci_gcc_arm_setup { - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi - arm-none-eabi-gcc --version -} - -######################################################################################## -# code formatting - -function ci_code_formatting_setup { - sudo apt-add-repository --yes --update ppa:pybricks/ppa - sudo apt-get install uncrustify - pip3 install black - uncrustify --version - black --version -} - -function ci_code_formatting_run { - tools/codeformat.py -v -} - -######################################################################################## -# commit formatting - -function ci_commit_formatting_run { - git remote add upstream https://github.com/micropython/micropython.git - git fetch --depth=100 upstream master - # For a PR, upstream/master..HEAD ends with a merge commit into master, exlude that one. - tools/verifygitlog.py -v upstream/master..HEAD --no-merges -} - -######################################################################################## -# code size - -function ci_code_size_setup { - sudo apt-get update - sudo apt-get install gcc-multilib - gcc --version - ci_gcc_arm_setup -} - -function ci_code_size_build { - # starts off at either the ref/pull/N/merge FETCH_HEAD, or the current branch HEAD - git checkout -b pull_request # save the current location - git remote add upstream https://github.com/micropython/micropython.git - git fetch --depth=100 upstream master - # build reference, save to size0 - # ignore any errors with this build, in case master is failing - git checkout `git merge-base --fork-point upstream/master pull_request` - git show -s - tools/metrics.py clean bm - tools/metrics.py build bm | tee ~/size0 || true - # build PR/branch, save to size1 - git checkout pull_request - git log upstream/master..HEAD - tools/metrics.py clean bm - tools/metrics.py build bm | tee ~/size1 -} - -######################################################################################## -# ports/cc3200 - -function ci_cc3200_setup { - ci_gcc_arm_setup -} - -function ci_cc3200_build { - make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release - make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader BTYPE=release -} - -######################################################################################## -# ports/esp32 - -function ci_esp32_setup_helper { - git clone https://github.com/espressif/esp-idf.git - git -C esp-idf checkout $1 - git -C esp-idf submodule update --init \ - components/bt/controller/lib \ - components/bt/host/nimble/nimble \ - components/esp_wifi \ - components/esptool_py/esptool \ - components/lwip/lwip \ - components/mbedtls/mbedtls - ./esp-idf/install.sh -} - -function ci_esp32_idf402_setup { - ci_esp32_setup_helper v4.0.2 -} - -function ci_esp32_idf43_setup { - ci_esp32_setup_helper v4.3-beta2 -} - -function ci_esp32_build { - source esp-idf/export.sh - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/esp32 submodules - make ${MAKEOPTS} -C ports/esp32 - make ${MAKEOPTS} -C ports/esp32 clean - make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py - if [ -d $IDF_PATH/components/esp32s2 ]; then - make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2 - fi -} - -######################################################################################## -# ports/esp8266 - -function ci_esp8266_setup { - sudo pip install pyserial esptool - wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz - zcat xtensa-lx106-elf-standalone.tar.gz | tar x - # Remove this esptool.py so pip version is used instead - rm xtensa-lx106-elf/bin/esptool.py -} - -function ci_esp8266_path { - echo $(pwd)/xtensa-lx106-elf/bin -} - -function ci_esp8266_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/esp8266 submodules - make ${MAKEOPTS} -C ports/esp8266 - make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_512K - make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_1M -} - -######################################################################################## -# ports/mimxrt - -function ci_mimxrt_setup { - ci_gcc_arm_setup -} - -function ci_mimxrt_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/mimxrt submodules - make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK - make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40 -} - -######################################################################################## -# ports/nrf - -function ci_nrf_setup { - ci_gcc_arm_setup -} - -function ci_nrf_build { - ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1 - make ${MAKEOPTS} -C ports/nrf submodules - make ${MAKEOPTS} -C ports/nrf BOARD=pca10040 - make ${MAKEOPTS} -C ports/nrf BOARD=microbit - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140 - make ${MAKEOPTS} -C ports/nrf BOARD=pca10090 -} - -######################################################################################## -# ports/powerpc - -function ci_powerpc_setup { - sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross -} - -function ci_powerpc_build { - make ${MAKEOPTS} -C ports/powerpc UART=potato - make ${MAKEOPTS} -C ports/powerpc UART=lpc_serial -} - -######################################################################################## -# ports/qemu-arm - -function ci_qemu_arm_setup { - ci_gcc_arm_setup - sudo apt-get update - sudo apt-get install qemu-system - qemu-system-arm --version -} - -function ci_qemu_arm_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1 - make ${MAKEOPTS} -C ports/qemu-arm clean - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test clean - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test BOARD=sabrelite test -} - -######################################################################################## -# ports/rp2 - -function ci_rp2_setup { - ci_gcc_arm_setup -} - -function ci_rp2_build { - make ${MAKEOPTS} -C mpy-cross - git submodule update --init lib/pico-sdk lib/tinyusb - make ${MAKEOPTS} -C ports/rp2 - make ${MAKEOPTS} -C ports/rp2 clean - make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake -} - -######################################################################################## -# ports/samd - -function ci_samd_setup { - ci_gcc_arm_setup -} - -function ci_samd_build { - make ${MAKEOPTS} -C ports/samd submodules - make ${MAKEOPTS} -C ports/samd -} - -######################################################################################## -# ports/stm32 - -function ci_stm32_setup { - ci_gcc_arm_setup - pip3 install pyhy -} - -function ci_stm32_pyb_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/stm32 submodules - git submodule update --init lib/btstack - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2 - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1 - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1' - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6 -} - -function ci_stm32_nucleo_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/stm32 submodules - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1' - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG DEBUG=1 - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55 - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55 - # Test mboot_pack_dfu.py created a valid file, and that its unpack-dfu command works. - BOARD_WB55=ports/stm32/boards/NUCLEO_WB55 - BUILD_WB55=ports/stm32/build-NUCLEO_WB55 - python3 ports/stm32/mboot/mboot_pack_dfu.py -k $BOARD_WB55/mboot_keys.h unpack-dfu $BUILD_WB55/firmware.pack.dfu $BUILD_WB55/firmware.unpack.dfu - diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.dfu - # Test unpack-dfu command works without a secret key - tail -n +2 $BOARD_WB55/mboot_keys.h > $BOARD_WB55/mboot_keys_no_sk.h - python3 ports/stm32/mboot/mboot_pack_dfu.py -k $BOARD_WB55/mboot_keys_no_sk.h unpack-dfu $BUILD_WB55/firmware.pack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu - diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu -} - -######################################################################################## -# ports/teensy - -function ci_teensy_setup { - ci_gcc_arm_setup -} - -function ci_teensy_build { - make ${MAKEOPTS} -C ports/teensy -} - -######################################################################################## -# ports/unix - -CI_UNIX_OPTS_SYS_SETTRACE=( - MICROPY_PY_BTREE=0 - MICROPY_PY_FFI=0 - MICROPY_PY_USSL=0 - CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1" -) - -CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS=( - MICROPY_PY_BTREE=0 - MICROPY_PY_FFI=0 - MICROPY_PY_USSL=0 - CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1" -) - -CI_UNIX_OPTS_QEMU_MIPS=( - CROSS_COMPILE=mips-linux-gnu- - VARIANT=coverage - MICROPY_STANDALONE=1 - LDFLAGS_EXTRA="-static" -) - -CI_UNIX_OPTS_QEMU_ARM=( - CROSS_COMPILE=arm-linux-gnueabi- - VARIANT=coverage - MICROPY_STANDALONE=1 -) - -function ci_unix_build_helper { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/unix "$@" submodules - make ${MAKEOPTS} -C ports/unix "$@" deplibs - make ${MAKEOPTS} -C ports/unix "$@" -} - -function ci_unix_build_ffi_lib_helper { - $1 $2 -shared -o tests/unix/ffi_lib.so tests/unix/ffi_lib.c -} - -function ci_unix_run_tests_helper { - make -C ports/unix "$@" test -} - -function ci_unix_run_tests_full_helper { - variant=$1 - shift - if [ $variant = standard ]; then - micropython=micropython - else - micropython=micropython-$variant - fi - make -C ports/unix VARIANT=$variant "$@" test_full - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-multitests.py multi_net/*.py) -} - -function ci_native_mpy_modules_build { - if [ "$1" = "" ]; then - arch=x64 - else - arch=$1 - fi - make -C examples/natmod/features1 ARCH=$arch - make -C examples/natmod/features2 ARCH=$arch - make -C examples/natmod/btree ARCH=$arch - make -C examples/natmod/framebuf ARCH=$arch - make -C examples/natmod/uheapq ARCH=$arch - make -C examples/natmod/urandom ARCH=$arch - make -C examples/natmod/ure ARCH=$arch - make -C examples/natmod/uzlib ARCH=$arch -} - -function ci_native_mpy_modules_32bit_build { - ci_native_mpy_modules_build x86 -} - -function ci_unix_minimal_build { - make ${MAKEOPTS} -C ports/unix VARIANT=minimal -} - -function ci_unix_minimal_run_tests { - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics) -} - -function ci_unix_standard_build { - ci_unix_build_helper VARIANT=standard - ci_unix_build_ffi_lib_helper gcc -} - -function ci_unix_standard_run_tests { - ci_unix_run_tests_full_helper standard -} - -function ci_unix_standard_run_perfbench { - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000) -} - -function ci_unix_coverage_setup { - sudo apt-get install lcov - sudo pip3 install setuptools - sudo pip3 install pyelftools - gcc --version - python3 --version -} - -function ci_unix_coverage_build { - ci_unix_build_helper VARIANT=coverage - ci_unix_build_ffi_lib_helper gcc -} - -function ci_unix_coverage_run_tests { - ci_unix_run_tests_full_helper coverage -} - -function ci_unix_coverage_run_native_mpy_tests { - MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2 - (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py) -} - -function ci_unix_32bit_setup { - sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386 - sudo pip3 install setuptools - sudo pip3 install pyelftools - gcc --version - python2 --version - python3 --version -} - -function ci_unix_coverage_32bit_build { - ci_unix_build_helper VARIANT=coverage MICROPY_FORCE_32BIT=1 - ci_unix_build_ffi_lib_helper gcc -m32 -} - -function ci_unix_coverage_32bit_run_tests { - ci_unix_run_tests_full_helper coverage MICROPY_FORCE_32BIT=1 -} - -function ci_unix_coverage_32bit_run_native_mpy_tests { - ci_unix_coverage_run_native_mpy_tests --arch x86 -} - -function ci_unix_nanbox_build { - # Use Python 2 to check that it can run the build scripts - ci_unix_build_helper PYTHON=python2 VARIANT=nanbox - ci_unix_build_ffi_lib_helper gcc -m32 -} - -function ci_unix_nanbox_run_tests { - ci_unix_run_tests_full_helper nanbox PYTHON=python2 -} - -function ci_unix_float_build { - ci_unix_build_helper VARIANT=standard CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT" - ci_unix_build_ffi_lib_helper gcc -} - -function ci_unix_float_run_tests { - # TODO get this working: ci_unix_run_tests_full_helper standard CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT" - ci_unix_run_tests_helper CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT" -} - -function ci_unix_clang_setup { - sudo apt-get install clang - clang --version -} - -function ci_unix_stackless_clang_build { - make ${MAKEOPTS} -C mpy-cross CC=clang - make ${MAKEOPTS} -C ports/unix submodules - make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1" -} - -function ci_unix_stackless_clang_run_tests { - ci_unix_run_tests_helper CC=clang -} - -function ci_unix_float_clang_build { - make ${MAKEOPTS} -C mpy-cross CC=clang - make ${MAKEOPTS} -C ports/unix submodules - make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT" -} - -function ci_unix_float_clang_run_tests { - ci_unix_run_tests_helper CC=clang -} - -function ci_unix_settrace_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SYS_SETTRACE[@]}" -} - -function ci_unix_settrace_run_tests { - ci_unix_run_tests_helper "${CI_UNIX_OPTS_SYS_SETTRACE[@]}" -} - -function ci_unix_settrace_stackless_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}" -} - -function ci_unix_settrace_stackless_run_tests { - ci_unix_run_tests_helper "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}" -} - -function ci_unix_macos_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/unix submodules - #make ${MAKEOPTS} -C ports/unix deplibs - make ${MAKEOPTS} -C ports/unix - # check for additional compiler errors/warnings - make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules - make ${MAKEOPTS} -C ports/unix VARIANT=coverage -} - -function ci_unix_macos_run_tests { - # Issues with macOS tests: - # - OSX has poor time resolution and these uasyncio tests do not have correct output - # - import_pkg7 has a problem with relative imports - # - urandom_basic has a problem with getrandbits(0) - (cd tests && ./run-tests.py --exclude 'uasyncio_(basic|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py') -} - -function ci_unix_qemu_mips_setup { - sudo apt-get update - sudo apt-get install gcc-mips-linux-gnu g++-mips-linux-gnu - sudo apt-get install qemu-user - qemu-mips --version -} - -function ci_unix_qemu_mips_build { - # qemu-mips on GitHub Actions will seg-fault if not linked statically - ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_MIPS[@]}" -} - -function ci_unix_qemu_mips_run_tests { - # Issues with MIPS tests: - # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call) - # - ffi tests do not work - file ./ports/unix/micropython-coverage - (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py') -} - -function ci_unix_qemu_arm_setup { - sudo apt-get update - sudo apt-get install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi - sudo apt-get install qemu-user - qemu-arm --version -} - -function ci_unix_qemu_arm_build { - ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_ARM[@]}" - ci_unix_build_ffi_lib_helper arm-linux-gnueabi-gcc -} - -function ci_unix_qemu_arm_run_tests { - # Issues with ARM tests: - # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call) - export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi - file ./ports/unix/micropython-coverage - (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py') -} - -######################################################################################## -# ports/windows - -function ci_windows_setup { - sudo apt-get install gcc-mingw-w64 -} - -function ci_windows_build { - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32- -} - -######################################################################################## -# ports/zephyr - -function ci_zephyr_setup { - docker pull zephyrprojectrtos/ci:v0.17.3 - docker run --name zephyr-ci -d -it \ - -v "$(pwd)":/micropython \ - -e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-0.12.4 \ - -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \ - -e ZEPHYR_BASE=/zephyrproject/zephyr \ - -w /micropython/ports/zephyr \ - zephyrprojectrtos/ci:v0.17.3 - docker ps -a -} - -function ci_zephyr_install { - docker exec zephyr-ci west init --mr v2.6.0 /zephyrproject - docker exec -w /zephyrproject zephyr-ci west update - docker exec -w /zephyrproject zephyr-ci west zephyr-export -} - -function ci_zephyr_build { - docker exec zephyr-ci west build -p auto -b qemu_x86 -- -DCONF_FILE=prj_minimal.conf - docker exec zephyr-ci west build -p auto -b frdm_k64f -- -DCONF_FILE=prj_minimal.conf - docker exec zephyr-ci west build -p auto -b qemu_x86 - docker exec zephyr-ci west build -p auto -b frdm_k64f - docker exec zephyr-ci west build -p auto -b mimxrt1050_evk - docker exec zephyr-ci west build -p auto -b reel_board -} diff --git a/tools/ci_changed_board_list.py b/tools/ci_changed_board_list.py index 221b1ecaa3..aab966e56b 100644 --- a/tools/ci_changed_board_list.py +++ b/tools/ci_changed_board_list.py @@ -22,7 +22,7 @@ import build_board_info PORT_TO_ARCH = { "atmel-samd": "arm", "cxd56": "arm", - "esp32s2": "xtensa", + "espressif": "espressif", "litex": "riscv", "mimxrt10xx": "arm", "nrf": "arm", diff --git a/tools/merge_micropython.py b/tools/merge_micropython.py index 1f0d076a16..620d6896d2 100644 --- a/tools/merge_micropython.py +++ b/tools/merge_micropython.py @@ -188,7 +188,7 @@ always_ours = [ "shared-module", "ports/atmel-samd", "ports/cxd56", - "ports/esp32s2", + "ports/espressif", "ports/mimxrt10xx", "ports/raspberrypi", "ports/stm",