diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76e2d5c..b9dcc03 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,17 @@ stages: - deploy + - check + +check_lib_reversion: + stage: check + except: + - master + - /^release\/v/ + image: $CI_DOCKER_REGISTRY/esp32-ci-env + script: + - 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; + push_master_to_github: stage: deploy diff --git a/esp32c3/libbtbb.a b/esp32c3/libbtbb.a index 8d30c9c..b9f3f44 100644 Binary files a/esp32c3/libbtbb.a and b/esp32c3/libbtbb.a differ diff --git a/esp32c3/libphy.a b/esp32c3/libphy.a index 7f13bfb..28f6774 100644 Binary files a/esp32c3/libphy.a and b/esp32c3/libphy.a differ diff --git a/esp32h2/libbtbb.a b/esp32h2/libbtbb.a index 0eb776e..ad1c3b5 100644 Binary files a/esp32h2/libbtbb.a and b/esp32h2/libbtbb.a differ diff --git a/esp32h2/libphy.a b/esp32h2/libphy.a index bd0a0be..d66e76a 100644 Binary files a/esp32h2/libphy.a and b/esp32h2/libphy.a differ diff --git a/esp32s3/libbtbb.a b/esp32s3/libbtbb.a index b3bb0e2..da9a454 100644 Binary files a/esp32s3/libbtbb.a and b/esp32s3/libbtbb.a differ diff --git a/esp32s3/libphy.a b/esp32s3/libphy.a index d6dcc9e..e5fc845 100644 Binary files a/esp32s3/libphy.a and b/esp32s3/libphy.a differ diff --git a/fix_printf.sh b/fix_printf.sh index 4e1bdc8..b698af0 100755 --- a/fix_printf.sh +++ b/fix_printf.sh @@ -1,5 +1,5 @@ #!/bin/bash -for dir in esp32 esp32s2 esp32c3 esp32s3; do +for dir in esp32 esp32s2 esp32c3 esp32s3 esp32h2; do if [ $dir = esp32 ]; then TOOLCHAIN="xtensa-esp32-elf" elif [ $dir = esp32s2 ]; then @@ -8,18 +8,26 @@ for dir in esp32 esp32s2 esp32c3 esp32s3; do TOOLCHAIN="riscv32-esp-elf" elif [ $dir = esp32s3 ]; then TOOLCHAIN="xtensa-esp32s3-elf" + elif [ $dir = esp32h2 ]; then + TOOLCHAIN="riscv32-esp-elf" else echo "$dir does not exist" fi if [ -d "$dir" ]; then cd $dir - if [ $dir = esp32 ] || [ $dir = esp32s2 ]; then + if [ $dir = esp32 ]; then git status librtc.a | grep "modified" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/librtc.a fixed $TOOLCHAIN-objcopy --redefine-sym ets_printf=rtc_printf librtc.a fi + elif [ $dir != esp32s2 ]; then + git status libbtbb.a | grep "modified" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo $dir/libbtbb.a fixed + $TOOLCHAIN-objcopy --redefine-sym ets_printf=rtc_printf libbtbb.a + fi fi git status libphy.a | grep "modified" >/dev/null 2>&1