diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50de6d9..eb1b1c6 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,14 +41,14 @@ check_lib_reversion: - GIT_COMMIT_ID=`git log --pretty="%s" -1 | grep -o '([0-9a-f]*)' | tail -1 | cut -c 2-8` - echo "GIT_COMMIT_ID is "$GIT_COMMIT_ID - test $(echo -n $GIT_COMMIT_ID | wc -c) -eq 7 - - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4; do grep $GIT_COMMIT_ID-remote $dir/libcoexist.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; - - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4; do test $(riscv32-esp-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4; do test $(riscv32-esp-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4 esp32h21; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4 esp32h21; do grep $GIT_COMMIT_ID-remote $dir/libcoexist.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4 esp32h21; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; + - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4 esp32h21; do test $(riscv32-esp-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4 esp32h21; do test $(riscv32-esp-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4; do cd $dir; for filename in *; do if [[ -x "$file" ]]; then echo "Execute permissions for $dir/$filename"; exit 1; fi; done; cd .. ; done + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4 esp32h21; do cd $dir; for filename in *; do if [[ -x "$file" ]]; then echo "Execute permissions for $dir/$filename"; exit 1; fi; done; cd .. ; done include: - 'tools/ci/config/build.yml' diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a index 6581d78..3e85f82 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32c2/libcoexist.a b/esp32c2/libcoexist.a index a41e985..6cd4b6b 100644 Binary files a/esp32c2/libcoexist.a and b/esp32c2/libcoexist.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a index 3702fbe..95e3e93 100644 Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ diff --git a/esp32c5/libcoexist.a b/esp32c5/libcoexist.a index 12ed58d..c10cdb9 100644 Binary files a/esp32c5/libcoexist.a and b/esp32c5/libcoexist.a differ diff --git a/esp32c6/libcoexist.a b/esp32c6/libcoexist.a index a63dc10..4f217c5 100644 Binary files a/esp32c6/libcoexist.a and b/esp32c6/libcoexist.a differ diff --git a/esp32c61/libcoexist.a b/esp32c61/libcoexist.a index c22ac3a..6b49453 100644 Binary files a/esp32c61/libcoexist.a and b/esp32c61/libcoexist.a differ diff --git a/esp32h2/libcoexist.a b/esp32h2/libcoexist.a index 49e952f..05b69a4 100644 Binary files a/esp32h2/libcoexist.a and b/esp32h2/libcoexist.a differ diff --git a/esp32h21/libcoexist.a b/esp32h21/libcoexist.a new file mode 100644 index 0000000..77435cc Binary files /dev/null and b/esp32h21/libcoexist.a differ diff --git a/esp32h4/libcoexist.a b/esp32h4/libcoexist.a index ec25c65..e1771d0 100644 Binary files a/esp32h4/libcoexist.a and b/esp32h4/libcoexist.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a index 5425cce..dc0cba5 100644 Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a index 5ae3ef2..bd36fa3 100644 Binary files a/esp32s3/libcoexist.a and b/esp32s3/libcoexist.a differ diff --git a/esp32s31/libcoexist.a b/esp32s31/libcoexist.a index cdbfb25..273b4bb 100644 Binary files a/esp32s31/libcoexist.a and b/esp32s31/libcoexist.a differ diff --git a/fix_printf.sh b/fix_printf.sh index 636d168..ec9a3c9 100755 --- a/fix_printf.sh +++ b/fix_printf.sh @@ -1,10 +1,10 @@ #!/bin/bash -for dir in esp32 esp32s2 esp32c3 esp32s3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4; do +for dir in esp32 esp32s2 esp32c3 esp32s3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31 esp32h4 esp32h21; do if [ $dir = esp32 ]; then TOOLCHAIN="xtensa-esp32-elf" elif [ $dir = esp32s2 ]; then TOOLCHAIN="xtensa-esp32s2-elf" - elif [ $dir = esp32c3 -o $dir = esp32c2 -o $dir = esp32c6 -o $dir = esp32h2 -o $dir = esp32c5 -o $dir = esp32c61 -o $dir = esp32s31 -o $dir = esp32h4 ]; then + elif [ $dir = esp32c3 -o $dir = esp32c2 -o $dir = esp32c6 -o $dir = esp32h2 -o $dir = esp32c5 -o $dir = esp32c61 -o $dir = esp32s31 -o $dir = esp32h4 -o $dir = esp32h21 ]; then TOOLCHAIN="riscv32-esp-elf" elif [ $dir = esp32s3 ]; then TOOLCHAIN="xtensa-esp32s3-elf"