diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b00cf5..13cd755 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; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61; do grep $GIT_COMMIT_ID-remote $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 $(riscv32-esp-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61; 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; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31; do grep $GIT_COMMIT_ID-remote $dir/libcoexist.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; + - for dir in esp32c3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31; 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; 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; 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; 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 c171e32..ad186be 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32c2/libcoexist.a b/esp32c2/libcoexist.a index e6847f6..e1310fb 100644 Binary files a/esp32c2/libcoexist.a and b/esp32c2/libcoexist.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a index 17479b0..a8e89e9 100644 Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ diff --git a/esp32c5/libcoexist.a b/esp32c5/libcoexist.a index 149c9bf..22f90b6 100644 Binary files a/esp32c5/libcoexist.a and b/esp32c5/libcoexist.a differ diff --git a/esp32c6/libcoexist.a b/esp32c6/libcoexist.a index 6f5a546..a48e0ab 100644 Binary files a/esp32c6/libcoexist.a and b/esp32c6/libcoexist.a differ diff --git a/esp32c61/libcoexist.a b/esp32c61/libcoexist.a index 71c4d80..da69bb0 100644 Binary files a/esp32c61/libcoexist.a and b/esp32c61/libcoexist.a differ diff --git a/esp32h2/libcoexist.a b/esp32h2/libcoexist.a index 5da6270..0ce0fd0 100644 Binary files a/esp32h2/libcoexist.a and b/esp32h2/libcoexist.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a index 12f7222..3635f71 100644 Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a index 0f5ef01..124c452 100644 Binary files a/esp32s3/libcoexist.a and b/esp32s3/libcoexist.a differ diff --git a/esp32s31/libcoexist.a b/esp32s31/libcoexist.a new file mode 100644 index 0000000..835d3a2 Binary files /dev/null and b/esp32s31/libcoexist.a differ diff --git a/fix_printf.sh b/fix_printf.sh index dff99c0..c377234 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; do +for dir in esp32 esp32s2 esp32c3 esp32s3 esp32c2 esp32c6 esp32h2 esp32c5 esp32c61 esp32s31; 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 ]; then + elif [ $dir = esp32c3 -o $dir = esp32c2 -o $dir = esp32c6 -o $dir = esp32h2 -o $dir = esp32c5 -o $dir = esp32c61 -o $dir = esp32s31 ]; then TOOLCHAIN="riscv32-esp-elf" elif [ $dir = esp32s3 ]; then TOOLCHAIN="xtensa-esp32s3-elf"