Release esp-2021r2-patch4

Based on configs from esp-1.24.x
espressif · Sep 8, 2022 · cce5d28 · cce5d28
1 parent c6ca418
commit cce5d28
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 40 deletions.
diff --git a/samples/riscv32-esp-elf/crosstool.config b/samples/riscv32-esp-elf/crosstool.config
@@ -20,18 +20,18 @@ CT_DEBUG_GDB=y
 
 # NOTE: crosstool-ng doesn't apply bundled patches in the case of using git repo
 
-CT_NEWLIB_V_4_1=y
-CT_NEWLIB_VERSION="4.1.0"
+CT_NEWLIB_V_3_3=y
+CT_NEWLIB_VERSION="3.3.0"
 CT_NEWLIB_SRC_DEVEL=y
 CT_NEWLIB_DEVEL_VCS_git=y
 CT_NEWLIB_DEVEL_VCS="git"
 CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
-CT_NEWLIB_DEVEL_BRANCH="esp-2022r1"
+CT_NEWLIB_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_NEWLIB_DEVEL_REVISION=""
 CT_NEWLIB_DEVEL_SUBDIR=""
 CT_NEWLIB_DEVEL_BOOTSTRAP=""
 CT_LIBC_NEWLIB_TARGET_CFLAGS=""
-CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
+CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
 CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
 CT_LIBC_NEWLIB_REENT_SMALL=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
@@ -42,16 +42,18 @@ CT_LIBC_NEWLIB_WIDE_ORIENT=n
 
 CT_LIBC_NEWLIB_AUX_BUILD=y
 CT_LIBC_NEWLIB_AUX_BUILD_NAME="nano"
-CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
+CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
 CT_LIBC_NEWLIB_AUX_BUILD_TARGET_CFLAGS=""
 
-CT_GCC_V_11=y
-CT_GCC_VERSION="11.2.0"
+# For compatibility with GCC 8, change it when update
+CT_ISL_V_0_19=y
+CT_GCC_V_8_4_0=y
+CT_GCC_VERSION="8.4.0"
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_VCS_git=y
 CT_GCC_DEVEL_VCS="git"
 CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
-CT_GCC_DEVEL_BRANCH="esp-2022r1"
+CT_GCC_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_GCC_DEVEL_REVISION=""
 CT_GCC_DEVEL_SUBDIR=""
 CT_GCC_DEVEL_BOOTSTRAP=""
@@ -62,7 +64,7 @@ CT_BINUTILS_SRC_DEVEL=y
 CT_BINUTILS_DEVEL_VCS_git=y
 CT_BINUTILS_DEVEL_VCS="git"
 CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_BINUTILS_DEVEL_BRANCH="esp-2022r1-binutils"
+CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-patch4-binutils"
 CT_BINUTILS_DEVEL_REVISION=""
 CT_BINUTILS_DEVEL_SUBDIR=""
 CT_BINUTILS_DEVEL_BOOTSTRAP=""
@@ -73,7 +75,7 @@ CT_GDB_SRC_DEVEL=y
 CT_GDB_DEVEL_VCS_git=y
 CT_GDB_DEVEL_VCS="git"
 CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_GDB_DEVEL_BRANCH="esp-2022r1-gdb"
+CT_GDB_DEVEL_BRANCH="esp-2021r2-patch4-gdb"
 CT_GDB_DEVEL_REVISION=""
 CT_GDB_DEVEL_SUBDIR=""
 CT_GDB_DEVEL_BOOTSTRAP=""

diff --git a/samples/xtensa-esp32-elf/crosstool.config b/samples/xtensa-esp32-elf/crosstool.config
@@ -19,18 +19,18 @@ CT_OVERLAY_LOCATION="${CT_TOP_DIR}/overlays"
 
 # NOTE: crosstool-ng doesn't apply bundled patches in the case of using git repo
 
-CT_NEWLIB_V_4_1=y
-CT_NEWLIB_VERSION="4.1.0"
+CT_NEWLIB_V_3_3=y
+CT_NEWLIB_VERSION="3.3.0"
 CT_NEWLIB_SRC_DEVEL=y
 CT_NEWLIB_DEVEL_VCS_git=y
 CT_NEWLIB_DEVEL_VCS="git"
 CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
-CT_NEWLIB_DEVEL_BRANCH="esp-2022r1"
+CT_NEWLIB_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_NEWLIB_DEVEL_REVISION=""
 CT_NEWLIB_DEVEL_SUBDIR=""
 CT_NEWLIB_DEVEL_BOOTSTRAP=""
 CT_LIBC_NEWLIB_TARGET_CFLAGS=""
-CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
+CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
 CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
 CT_LIBC_NEWLIB_REENT_SMALL=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
@@ -41,16 +41,18 @@ CT_LIBC_NEWLIB_WIDE_ORIENT=n
 
 CT_LIBC_NEWLIB_AUX_BUILD=y
 CT_LIBC_NEWLIB_AUX_BUILD_NAME="nano"
-CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
+CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
 CT_LIBC_NEWLIB_AUX_BUILD_TARGET_CFLAGS=""
 
-CT_GCC_V_11=y
-CT_GCC_VERSION="11.2.0"
+# For compatibility with GCC 8, change it when update
+CT_ISL_V_0_19=y
+CT_GCC_V_8_4_0=y
+CT_GCC_VERSION="8.4.0"
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_VCS_git=y
 CT_GCC_DEVEL_VCS="git"
 CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
-CT_GCC_DEVEL_BRANCH="esp-2022r1"
+CT_GCC_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_GCC_DEVEL_REVISION=""
 CT_GCC_DEVEL_SUBDIR=""
 CT_GCC_DEVEL_BOOTSTRAP=""
@@ -61,7 +63,7 @@ CT_BINUTILS_SRC_DEVEL=y
 CT_BINUTILS_DEVEL_VCS_git=y
 CT_BINUTILS_DEVEL_VCS="git"
 CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_BINUTILS_DEVEL_BRANCH="esp-2022r1-binutils"
+CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-patch4-binutils"
 CT_BINUTILS_DEVEL_REVISION=""
 CT_BINUTILS_DEVEL_SUBDIR=""
 CT_BINUTILS_DEVEL_BOOTSTRAP=""
@@ -72,7 +74,7 @@ CT_GDB_SRC_DEVEL=y
 CT_GDB_DEVEL_VCS_git=y
 CT_GDB_DEVEL_VCS="git"
 CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_GDB_DEVEL_BRANCH="esp-2022r1-gdb"
+CT_GDB_DEVEL_BRANCH="esp-2021r2-patch4-gdb"
 CT_GDB_DEVEL_REVISION=""
 CT_GDB_DEVEL_SUBDIR=""
 CT_GDB_DEVEL_BOOTSTRAP=""

diff --git a/samples/xtensa-esp32s2-elf/crosstool.config b/samples/xtensa-esp32s2-elf/crosstool.config
@@ -19,18 +19,18 @@ CT_OVERLAY_LOCATION="${CT_TOP_DIR}/overlays"
 
 # NOTE: crosstool-ng doesn't apply bundled patches in the case of using git repo
 
-CT_NEWLIB_V_4_1=y
-CT_NEWLIB_VERSION="4.1.0"
+CT_NEWLIB_V_3_3=y
+CT_NEWLIB_VERSION="3.3.0"
 CT_NEWLIB_SRC_DEVEL=y
 CT_NEWLIB_DEVEL_VCS_git=y
 CT_NEWLIB_DEVEL_VCS="git"
 CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
-CT_NEWLIB_DEVEL_BRANCH="esp-2022r1"
+CT_NEWLIB_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_NEWLIB_DEVEL_REVISION=""
 CT_NEWLIB_DEVEL_SUBDIR=""
 CT_NEWLIB_DEVEL_BOOTSTRAP=""
 CT_LIBC_NEWLIB_TARGET_CFLAGS=""
-CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
+CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
 CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
 CT_LIBC_NEWLIB_REENT_SMALL=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
@@ -41,16 +41,18 @@ CT_LIBC_NEWLIB_WIDE_ORIENT=n
 
 CT_LIBC_NEWLIB_AUX_BUILD=y
 CT_LIBC_NEWLIB_AUX_BUILD_NAME="nano"
-CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
+CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
 CT_LIBC_NEWLIB_AUX_BUILD_TARGET_CFLAGS=""
 
-CT_GCC_V_11=y
-CT_GCC_VERSION="11.2.0"
+# For compatibility with GCC 8, change it when update
+CT_ISL_V_0_19=y
+CT_GCC_V_8_4_0=y
+CT_GCC_VERSION="8.4.0"
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_VCS_git=y
 CT_GCC_DEVEL_VCS="git"
 CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
-CT_GCC_DEVEL_BRANCH="esp-2022r1"
+CT_GCC_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_GCC_DEVEL_REVISION=""
 CT_GCC_DEVEL_SUBDIR=""
 CT_GCC_DEVEL_BOOTSTRAP=""
@@ -61,7 +63,7 @@ CT_BINUTILS_SRC_DEVEL=y
 CT_BINUTILS_DEVEL_VCS_git=y
 CT_BINUTILS_DEVEL_VCS="git"
 CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_BINUTILS_DEVEL_BRANCH="esp-2022r1-binutils"
+CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-patch4-binutils"
 CT_BINUTILS_DEVEL_REVISION=""
 CT_BINUTILS_DEVEL_SUBDIR=""
 CT_BINUTILS_DEVEL_BOOTSTRAP=""
@@ -72,7 +74,7 @@ CT_GDB_SRC_DEVEL=y
 CT_GDB_DEVEL_VCS_git=y
 CT_GDB_DEVEL_VCS="git"
 CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_GDB_DEVEL_BRANCH="esp-2022r1-gdb"
+CT_GDB_DEVEL_BRANCH="esp-2021r2-patch4-gdb"
 CT_GDB_DEVEL_REVISION=""
 CT_GDB_DEVEL_SUBDIR=""
 CT_GDB_DEVEL_BOOTSTRAP=""

diff --git a/samples/xtensa-esp32s3-elf/crosstool.config b/samples/xtensa-esp32s3-elf/crosstool.config
@@ -19,18 +19,18 @@ CT_OVERLAY_LOCATION="${CT_TOP_DIR}/overlays"
 
 # NOTE: crosstool-ng doesn't apply bundled patches in the case of using git repo
 
-CT_NEWLIB_V_4_1=y
-CT_NEWLIB_VERSION="4.1.0"
+CT_NEWLIB_V_3_3=y
+CT_NEWLIB_VERSION="3.3.0"
 CT_NEWLIB_SRC_DEVEL=y
 CT_NEWLIB_DEVEL_VCS_git=y
 CT_NEWLIB_DEVEL_VCS="git"
 CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
-CT_NEWLIB_DEVEL_BRANCH="esp-2022r1"
+CT_NEWLIB_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_NEWLIB_DEVEL_REVISION=""
 CT_NEWLIB_DEVEL_SUBDIR=""
 CT_NEWLIB_DEVEL_BOOTSTRAP=""
 CT_LIBC_NEWLIB_TARGET_CFLAGS=""
-CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
+CT_LIBC_NEWLIB_EXTRA_CONFIG_ARRAY="--enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --enable-newlib-iconv"
 CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
 CT_LIBC_NEWLIB_REENT_SMALL=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
@@ -41,16 +41,18 @@ CT_LIBC_NEWLIB_WIDE_ORIENT=n
 
 CT_LIBC_NEWLIB_AUX_BUILD=y
 CT_LIBC_NEWLIB_AUX_BUILD_NAME="nano"
-CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
+CT_LIBC_NEWLIB_AUX_BUILD_EXTRA_CONFIG_ARRAY="--with-newlib --enable-multilib --disable-newlib-io-c99-formats --disable-newlib-supplied-syscalls --enable-newlib-nano-formatted-io --enable-newlib-reent-small --enable-target-optspace --enable-newlib-long-time_t --enable-newlib-nano-malloc --enable-newlib-retargetable-locking --disable-newlib_wide_orient --enable-newlib-iconv"
 CT_LIBC_NEWLIB_AUX_BUILD_TARGET_CFLAGS=""
 
-CT_GCC_V_11=y
-CT_GCC_VERSION="11.2.0"
+# For compatibility with GCC 8, change it when update
+CT_ISL_V_0_19=y
+CT_GCC_V_8_4_0=y
+CT_GCC_VERSION="8.4.0"
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_VCS_git=y
 CT_GCC_DEVEL_VCS="git"
 CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
-CT_GCC_DEVEL_BRANCH="esp-2022r1"
+CT_GCC_DEVEL_BRANCH="esp-2021r2-patch4"
 CT_GCC_DEVEL_REVISION=""
 CT_GCC_DEVEL_SUBDIR=""
 CT_GCC_DEVEL_BOOTSTRAP=""
@@ -61,7 +63,7 @@ CT_BINUTILS_SRC_DEVEL=y
 CT_BINUTILS_DEVEL_VCS_git=y
 CT_BINUTILS_DEVEL_VCS="git"
 CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_BINUTILS_DEVEL_BRANCH="esp-2022r1-binutils"
+CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-patch4-binutils"
 CT_BINUTILS_DEVEL_REVISION=""
 CT_BINUTILS_DEVEL_SUBDIR=""
 CT_BINUTILS_DEVEL_BOOTSTRAP=""
@@ -72,7 +74,7 @@ CT_GDB_SRC_DEVEL=y
 CT_GDB_DEVEL_VCS_git=y
 CT_GDB_DEVEL_VCS="git"
 CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
-CT_GDB_DEVEL_BRANCH="esp-2022r1-gdb"
+CT_GDB_DEVEL_BRANCH="esp-2021r2-patch4-gdb"
 CT_GDB_DEVEL_REVISION=""
 CT_GDB_DEVEL_SUBDIR=""
 CT_GDB_DEVEL_BOOTSTRAP=""