diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f261bec..5a40d34 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,13 +30,13 @@ 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; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; - - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5; do test $(riscv-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5; do test $(riscv-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; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; + - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61; do test $(riscv-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61; do test $(riscv-esp32-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; 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; 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 260d21a..64fbba0 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32c2/libcoexist.a b/esp32c2/libcoexist.a index c62a2fd..980eb71 100644 Binary files a/esp32c2/libcoexist.a and b/esp32c2/libcoexist.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a index 4bec15d..7d6f7b0 100644 Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ diff --git a/esp32c5/libcoexist.a b/esp32c5/libcoexist.a index 72e5154..54f73f4 100644 Binary files a/esp32c5/libcoexist.a and b/esp32c5/libcoexist.a differ diff --git a/esp32c6/libcoexist.a b/esp32c6/libcoexist.a index 8ec6f9b..38b08ad 100644 Binary files a/esp32c6/libcoexist.a and b/esp32c6/libcoexist.a differ diff --git a/esp32c61/libcoexist.a b/esp32c61/libcoexist.a new file mode 100644 index 0000000..79e369d Binary files /dev/null and b/esp32c61/libcoexist.a differ diff --git a/esp32h2/libcoexist.a b/esp32h2/libcoexist.a index 0982a31..c604fe1 100644 Binary files a/esp32h2/libcoexist.a and b/esp32h2/libcoexist.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a index 28c0897..7b6ff04 100644 Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a index 93c01ff..12c1078 100644 Binary files a/esp32s3/libcoexist.a and b/esp32s3/libcoexist.a differ diff --git a/fix_printf.sh b/fix_printf.sh index cb3298d..dff99c0 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; do +for dir in esp32 esp32s2 esp32c3 esp32s3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61; 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 ]; then + elif [ $dir = esp32c3 -o $dir = esp32c2 -o $dir = esp32c6 -o $dir = esp32h2 -o $dir = esp32c5 -o $dir = esp32c61 ]; then TOOLCHAIN="riscv32-esp-elf" elif [ $dir = esp32s3 ]; then TOOLCHAIN="xtensa-esp32s3-elf"