diff options
| author | Damien George <damien@micropython.org> | 2021-07-22 18:31:49 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-07-22 22:42:37 +1000 |
| commit | 0256e1ab8b8ca376a9c4da83e375ff01ce1b8af0 (patch) | |
| tree | 4b7c475f94e4a97a95aaff4146161b4b69a17ed7 | |
| parent | 7f69246895ed4df78909c3558b91624ad3b3986c (diff) | |
tools/autobuild: Use separate IDF version to build newer esp32 SoCs.
Signed-off-by: Damien George <damien@micropython.org>
| -rwxr-xr-x | tools/autobuild/autobuild.sh | 15 | ||||
| -rwxr-xr-x | tools/autobuild/build-esp32-latest.sh | 12 |
2 files changed, 19 insertions, 8 deletions
diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh index 049844381..a14c7890f 100755 --- a/tools/autobuild/autobuild.sh +++ b/tools/autobuild/autobuild.sh @@ -4,7 +4,8 @@ # # Requirements: # - All toolchains must be in path (arm-none-eabi-gcc, xtensa-lx106-elf) -# - IDF_PATH_V4 must be set +# - IDF_PATH_V42 must be set +# - IDF_PATH_V43 must be set # - MICROPY_AUTOBUILD_MICROPYTHON_REPO must be set to location of micropython repository # - MICROPY_AUTOBUILD_MAKE must be set to the make command to use, eg "make -j2" # @@ -12,8 +13,13 @@ # - MICROPY_AUTOBUILD_REMOTE_MACHINE can be set to a remote ssh machine to copy files to # - MICROPY_AUTOBUILD_REMOTE_DIR can be set to destination directory on remote machine -if [ ! -d "$IDF_PATH_V4" ]; then - echo "must set IDF_PATH_V4" +if [ ! -d "$IDF_PATH_V42" ]; then + echo "must set IDF_PATH_V42" + exit 1 +fi + +if [ ! -d "$IDF_PATH_V43" ]; then + echo "must set IDF_PATH_V43" exit 1 fi @@ -63,7 +69,8 @@ ${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE} cd ../esp8266 ${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE} cd ../esp32 -${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V4} ${FW_TAG} ${LOCAL_FIRMWARE} +${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V42} ${FW_TAG} ${LOCAL_FIRMWARE} +${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V43} ${FW_TAG} ${LOCAL_FIRMWARE} cd ../rp2 ${AUTODIR}/build-rp2-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE} cd ../mimxrt diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh index e433332c9..3f94dbb5b 100755 --- a/tools/autobuild/build-esp32-latest.sh +++ b/tools/autobuild/build-esp32-latest.sh @@ -39,7 +39,11 @@ fi source $idf_path/export.sh -# build the versions -do_build esp32 GENERIC FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py -do_build esp32spiram GENERIC_SPIRAM FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py -do_build tinypico UM_TINYPICO +# build the boards, based on the IDF version +if idf.py --version | grep -q v4.2; then + do_build esp32 GENERIC FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py + do_build esp32spiram GENERIC_SPIRAM FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py + do_build tinypico UM_TINYPICO +else + do_build esp32c3 GENERIC_C3 +fi |