diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 56cc7e9f7..8525bdeec 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32h2] + target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2] fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/build.sh b/build.sh index 2564da44b..b88647a85 100755 --- a/build.sh +++ b/build.sh @@ -158,12 +158,20 @@ echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/ #targets_count=`jq -c '.targets[] | length' configs/builds.json` for target_json in `jq -c '.targets[]' configs/builds.json`; do target=$(echo "$target_json" | jq -c '.target' | tr -d '"') + target_skip=$(echo "$target_json" | jq -c '.skip // 0') if [ "$TARGET" != "all" ] && [ "$TARGET" != "$target" ]; then echo "* Skipping Target: $target" continue fi + # Skip chips that should not be a part of the final libs + # WARNING!!! this logic needs to be updated when cron builds are split into jobs + if [ "$TARGET" = "all" ] && [ $target_skip -eq 1 ]; then + echo "* Skipping Target: $target" + continue + fi + echo "* Target: $target" # Build Main Configs List diff --git a/configs/builds.json b/configs/builds.json index ef0943054..e34813cfa 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -4,7 +4,7 @@ "file":"libspi_flash.a", "src":"build/esp-idf/spi_flash/libspi_flash.a", "out":"lib/libspi_flash.a", - "targets":["esp32","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2"] + "targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2"] }, { "file":"libesp_psram.a", @@ -44,6 +44,21 @@ } ], "targets":[ + { + "target": "esp32c2", + "skip": 1, + "features":[], + "idf_libs":["qio","60m"], + "bootloaders":[ + ["qio","60m"], + ["dio","60m"], + ["qio","30m"], + ["dio","30m"] + ], + "mem_variants":[ + ["dio","60m"] + ] + }, { "target": "esp32h2", "features":[], @@ -133,4 +148,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/configs/defconfig.30m b/configs/defconfig.30m new file mode 100644 index 000000000..f915b230f --- /dev/null +++ b/configs/defconfig.30m @@ -0,0 +1 @@ +CONFIG_ESPTOOLPY_FLASHFREQ_30M=y diff --git a/configs/defconfig.60m b/configs/defconfig.60m new file mode 100644 index 000000000..797665f52 --- /dev/null +++ b/configs/defconfig.60m @@ -0,0 +1 @@ +CONFIG_ESPTOOLPY_FLASHFREQ_60M=y diff --git a/configs/defconfig.esp32c2 b/configs/defconfig.esp32c2 new file mode 100644 index 000000000..5f5e02505 --- /dev/null +++ b/configs/defconfig.esp32c2 @@ -0,0 +1,7 @@ +CONFIG_XTAL_FREQ_26=y +CONFIG_XTAL_FREQ=26 +CONFIG_BT_BLE_BLUFI_ENABLE=y +CONFIG_RTC_CLK_CAL_CYCLES=576 +# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set +CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 +CONFIG_ESP32C2_REV2_DEVELOPMENT=y diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index a5832f914..10edb39c4 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -11,8 +11,10 @@ config LIB_BUILDER_FLASHFREQ default "120m" if ESPTOOLPY_FLASHFREQ_120M default "80m" if ESPTOOLPY_FLASHFREQ_80M default "64m" if ESPTOOLPY_FLASHFREQ_64M + default "60m" if ESPTOOLPY_FLASHFREQ_60M default "40m" if ESPTOOLPY_FLASHFREQ_40M default "32m" if ESPTOOLPY_FLASHFREQ_32M + default "30m" if ESPTOOLPY_FLASHFREQ_30M default "26m" if ESPTOOLPY_FLASHFREQ_26M default "20m" if ESPTOOLPY_FLASHFREQ_20M default "16m" if ESPTOOLPY_FLASHFREQ_16M diff --git a/main/idf_component.yml b/main/idf_component.yml index badc471c8..011906d27 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -5,9 +5,13 @@ dependencies: version: "master" git: https://github.com/espressif/esp32-camera.git require: public + rules: + - if: "target in [esp32, esp32s2, esp32s3]" espressif/esp-tflite-micro: version: ">=1.2.0" require: public + rules: + - if: "target not in [esp32c2]" espressif/esp-dl: version: "master" git: https://github.com/espressif/esp-dl.git