diff --git a/.github/workflows/build_esp32.yml b/.github/workflows/build_esp32.yml index 0339a0f..2b01028 100644 --- a/.github/workflows/build_esp32.yml +++ b/.github/workflows/build_esp32.yml @@ -53,9 +53,6 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 - - name: Pull ESP-IDF docker - run: docker pull espressif/idf:release-v4.4 - - name: Checkout uses: actions/checkout@v2 @@ -63,7 +60,7 @@ jobs: run: git submodule update --init lib/tinyusb lib/uf2 - name: Build - run: docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.3 make -C ports/esp32s2/ BOARD=${{ matrix.board }} all self-update copy-artifact + run: docker run --rm -v $PWD:/project -w /project espressif/idf:release-v4.4 make -C ports/esp32s2/ BOARD=${{ matrix.board }} all self-update copy-artifact - uses: actions/upload-artifact@v2 with: diff --git a/ports/esp32s2/components/bootloader/subproject/main/bootloader_start.c b/ports/esp32s2/components/bootloader/subproject/main/bootloader_start.c index 7929785..a2acc00 100644 --- a/ports/esp32s2/components/bootloader/subproject/main/bootloader_start.c +++ b/ports/esp32s2/components/bootloader/subproject/main/bootloader_start.c @@ -22,12 +22,6 @@ #include "esp_rom_sys.h" #include "esp_rom_gpio.h" -#if CONFIG_IDF_TARGET_ESP32S2 - #include "esp32s2/rom/rtc.h" -#elif CONFIG_IDF_TARGET_ESP32S3 - #include "esp32s3/rom/rtc.h" -#endif - #include "soc/cpu.h" #include "hal/gpio_ll.h"