Browse Source

Use current development base branches

esp-1.24.x
Anton Maklakov 4 years ago
parent
commit
cf4ee24eb8
  1. 2
      .gitlab-ci.yml
  2. 8
      samples/riscv32-esp-elf/crosstool.config
  3. 8
      samples/xtensa-esp32-elf/crosstool.config
  4. 8
      samples/xtensa-esp32s2-elf/crosstool.config
  5. 8
      samples/xtensa-esp32s3-elf/crosstool.config

2
.gitlab-ci.yml

@ -455,7 +455,7 @@ riscv32_esp_lin_arm64:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
PLATFORM_NAME: "linux-amd64" PLATFORM_NAME: "linux-amd64"
ESP_COMPILER_TESTS_BRANCH: "-b esp-2021r2" ESP_COMPILER_TESTS_BRANCH: "-b master"
after_script: after_script:
- source citools/import_functions - source citools/import_functions
- cit_rm ${CONF_TARGET} - cit_rm ${CONF_TARGET}

8
samples/riscv32-esp-elf/crosstool.config

@ -26,7 +26,7 @@ CT_NEWLIB_SRC_DEVEL=y
CT_NEWLIB_DEVEL_VCS_git=y CT_NEWLIB_DEVEL_VCS_git=y
CT_NEWLIB_DEVEL_VCS="git" CT_NEWLIB_DEVEL_VCS="git"
CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git" CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
CT_NEWLIB_DEVEL_BRANCH="esp-2021r2" CT_NEWLIB_DEVEL_BRANCH="esp_based_on_3_3_0"
CT_NEWLIB_DEVEL_REVISION="" CT_NEWLIB_DEVEL_REVISION=""
CT_NEWLIB_DEVEL_SUBDIR="" CT_NEWLIB_DEVEL_SUBDIR=""
CT_NEWLIB_DEVEL_BOOTSTRAP="" CT_NEWLIB_DEVEL_BOOTSTRAP=""
@ -53,7 +53,7 @@ CT_GCC_SRC_DEVEL=y
CT_GCC_DEVEL_VCS_git=y CT_GCC_DEVEL_VCS_git=y
CT_GCC_DEVEL_VCS="git" CT_GCC_DEVEL_VCS="git"
CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git" CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
CT_GCC_DEVEL_BRANCH="esp-2021r2" CT_GCC_DEVEL_BRANCH="esp_based_on_8_4_0"
CT_GCC_DEVEL_REVISION="" CT_GCC_DEVEL_REVISION=""
CT_GCC_DEVEL_SUBDIR="" CT_GCC_DEVEL_SUBDIR=""
CT_GCC_DEVEL_BOOTSTRAP="" CT_GCC_DEVEL_BOOTSTRAP=""
@ -64,7 +64,7 @@ CT_BINUTILS_SRC_DEVEL=y
CT_BINUTILS_DEVEL_VCS_git=y CT_BINUTILS_DEVEL_VCS_git=y
CT_BINUTILS_DEVEL_VCS="git" CT_BINUTILS_DEVEL_VCS="git"
CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-binutils" CT_BINUTILS_DEVEL_BRANCH="esp_based_on_binutils-2_35"
CT_BINUTILS_DEVEL_REVISION="" CT_BINUTILS_DEVEL_REVISION=""
CT_BINUTILS_DEVEL_SUBDIR="" CT_BINUTILS_DEVEL_SUBDIR=""
CT_BINUTILS_DEVEL_BOOTSTRAP="" CT_BINUTILS_DEVEL_BOOTSTRAP=""
@ -75,7 +75,7 @@ CT_GDB_SRC_DEVEL=y
CT_GDB_DEVEL_VCS_git=y CT_GDB_DEVEL_VCS_git=y
CT_GDB_DEVEL_VCS="git" CT_GDB_DEVEL_VCS="git"
CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_GDB_DEVEL_BRANCH="esp-2021r2-gdb" CT_GDB_DEVEL_BRANCH="esp_based_on_gdb-9"
CT_GDB_DEVEL_REVISION="" CT_GDB_DEVEL_REVISION=""
CT_GDB_DEVEL_SUBDIR="" CT_GDB_DEVEL_SUBDIR=""
CT_GDB_DEVEL_BOOTSTRAP="" CT_GDB_DEVEL_BOOTSTRAP=""

8
samples/xtensa-esp32-elf/crosstool.config

@ -25,7 +25,7 @@ CT_NEWLIB_SRC_DEVEL=y
CT_NEWLIB_DEVEL_VCS_git=y CT_NEWLIB_DEVEL_VCS_git=y
CT_NEWLIB_DEVEL_VCS="git" CT_NEWLIB_DEVEL_VCS="git"
CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git" CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
CT_NEWLIB_DEVEL_BRANCH="esp-2021r2" CT_NEWLIB_DEVEL_BRANCH="esp_based_on_3_3_0"
CT_NEWLIB_DEVEL_REVISION="" CT_NEWLIB_DEVEL_REVISION=""
CT_NEWLIB_DEVEL_SUBDIR="" CT_NEWLIB_DEVEL_SUBDIR=""
CT_NEWLIB_DEVEL_BOOTSTRAP="" CT_NEWLIB_DEVEL_BOOTSTRAP=""
@ -52,7 +52,7 @@ CT_GCC_SRC_DEVEL=y
CT_GCC_DEVEL_VCS_git=y CT_GCC_DEVEL_VCS_git=y
CT_GCC_DEVEL_VCS="git" CT_GCC_DEVEL_VCS="git"
CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git" CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
CT_GCC_DEVEL_BRANCH="esp-2021r2" CT_GCC_DEVEL_BRANCH="esp_based_on_8_4_0"
CT_GCC_DEVEL_REVISION="" CT_GCC_DEVEL_REVISION=""
CT_GCC_DEVEL_SUBDIR="" CT_GCC_DEVEL_SUBDIR=""
CT_GCC_DEVEL_BOOTSTRAP="" CT_GCC_DEVEL_BOOTSTRAP=""
@ -63,7 +63,7 @@ CT_BINUTILS_SRC_DEVEL=y
CT_BINUTILS_DEVEL_VCS_git=y CT_BINUTILS_DEVEL_VCS_git=y
CT_BINUTILS_DEVEL_VCS="git" CT_BINUTILS_DEVEL_VCS="git"
CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-binutils" CT_BINUTILS_DEVEL_BRANCH="esp_based_on_binutils-2_35"
CT_BINUTILS_DEVEL_REVISION="" CT_BINUTILS_DEVEL_REVISION=""
CT_BINUTILS_DEVEL_SUBDIR="" CT_BINUTILS_DEVEL_SUBDIR=""
CT_BINUTILS_DEVEL_BOOTSTRAP="" CT_BINUTILS_DEVEL_BOOTSTRAP=""
@ -74,7 +74,7 @@ CT_GDB_SRC_DEVEL=y
CT_GDB_DEVEL_VCS_git=y CT_GDB_DEVEL_VCS_git=y
CT_GDB_DEVEL_VCS="git" CT_GDB_DEVEL_VCS="git"
CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_GDB_DEVEL_BRANCH="esp-2021r2-gdb" CT_GDB_DEVEL_BRANCH="esp_based_on_gdb-9"
CT_GDB_DEVEL_REVISION="" CT_GDB_DEVEL_REVISION=""
CT_GDB_DEVEL_SUBDIR="" CT_GDB_DEVEL_SUBDIR=""
CT_GDB_DEVEL_BOOTSTRAP="" CT_GDB_DEVEL_BOOTSTRAP=""

8
samples/xtensa-esp32s2-elf/crosstool.config

@ -25,7 +25,7 @@ CT_NEWLIB_SRC_DEVEL=y
CT_NEWLIB_DEVEL_VCS_git=y CT_NEWLIB_DEVEL_VCS_git=y
CT_NEWLIB_DEVEL_VCS="git" CT_NEWLIB_DEVEL_VCS="git"
CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git" CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
CT_NEWLIB_DEVEL_BRANCH="esp-2021r2" CT_NEWLIB_DEVEL_BRANCH="esp_based_on_3_3_0"
CT_NEWLIB_DEVEL_REVISION="" CT_NEWLIB_DEVEL_REVISION=""
CT_NEWLIB_DEVEL_SUBDIR="" CT_NEWLIB_DEVEL_SUBDIR=""
CT_NEWLIB_DEVEL_BOOTSTRAP="" CT_NEWLIB_DEVEL_BOOTSTRAP=""
@ -52,7 +52,7 @@ CT_GCC_SRC_DEVEL=y
CT_GCC_DEVEL_VCS_git=y CT_GCC_DEVEL_VCS_git=y
CT_GCC_DEVEL_VCS="git" CT_GCC_DEVEL_VCS="git"
CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git" CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
CT_GCC_DEVEL_BRANCH="esp-2021r2" CT_GCC_DEVEL_BRANCH="esp_based_on_8_4_0"
CT_GCC_DEVEL_REVISION="" CT_GCC_DEVEL_REVISION=""
CT_GCC_DEVEL_SUBDIR="" CT_GCC_DEVEL_SUBDIR=""
CT_GCC_DEVEL_BOOTSTRAP="" CT_GCC_DEVEL_BOOTSTRAP=""
@ -63,7 +63,7 @@ CT_BINUTILS_SRC_DEVEL=y
CT_BINUTILS_DEVEL_VCS_git=y CT_BINUTILS_DEVEL_VCS_git=y
CT_BINUTILS_DEVEL_VCS="git" CT_BINUTILS_DEVEL_VCS="git"
CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-binutils" CT_BINUTILS_DEVEL_BRANCH="esp_based_on_binutils-2_35"
CT_BINUTILS_DEVEL_REVISION="" CT_BINUTILS_DEVEL_REVISION=""
CT_BINUTILS_DEVEL_SUBDIR="" CT_BINUTILS_DEVEL_SUBDIR=""
CT_BINUTILS_DEVEL_BOOTSTRAP="" CT_BINUTILS_DEVEL_BOOTSTRAP=""
@ -74,7 +74,7 @@ CT_GDB_SRC_DEVEL=y
CT_GDB_DEVEL_VCS_git=y CT_GDB_DEVEL_VCS_git=y
CT_GDB_DEVEL_VCS="git" CT_GDB_DEVEL_VCS="git"
CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_GDB_DEVEL_BRANCH="esp-2021r2-gdb" CT_GDB_DEVEL_BRANCH="esp_based_on_gdb-9"
CT_GDB_DEVEL_REVISION="" CT_GDB_DEVEL_REVISION=""
CT_GDB_DEVEL_SUBDIR="" CT_GDB_DEVEL_SUBDIR=""
CT_GDB_DEVEL_BOOTSTRAP="" CT_GDB_DEVEL_BOOTSTRAP=""

8
samples/xtensa-esp32s3-elf/crosstool.config

@ -25,7 +25,7 @@ CT_NEWLIB_SRC_DEVEL=y
CT_NEWLIB_DEVEL_VCS_git=y CT_NEWLIB_DEVEL_VCS_git=y
CT_NEWLIB_DEVEL_VCS="git" CT_NEWLIB_DEVEL_VCS="git"
CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git" CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
CT_NEWLIB_DEVEL_BRANCH="esp-2021r2" CT_NEWLIB_DEVEL_BRANCH="esp_based_on_3_3_0"
CT_NEWLIB_DEVEL_REVISION="" CT_NEWLIB_DEVEL_REVISION=""
CT_NEWLIB_DEVEL_SUBDIR="" CT_NEWLIB_DEVEL_SUBDIR=""
CT_NEWLIB_DEVEL_BOOTSTRAP="" CT_NEWLIB_DEVEL_BOOTSTRAP=""
@ -52,7 +52,7 @@ CT_GCC_SRC_DEVEL=y
CT_GCC_DEVEL_VCS_git=y CT_GCC_DEVEL_VCS_git=y
CT_GCC_DEVEL_VCS="git" CT_GCC_DEVEL_VCS="git"
CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git" CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
CT_GCC_DEVEL_BRANCH="esp-2021r2" CT_GCC_DEVEL_BRANCH="esp_based_on_8_4_0"
CT_GCC_DEVEL_REVISION="" CT_GCC_DEVEL_REVISION=""
CT_GCC_DEVEL_SUBDIR="" CT_GCC_DEVEL_SUBDIR=""
CT_GCC_DEVEL_BOOTSTRAP="" CT_GCC_DEVEL_BOOTSTRAP=""
@ -63,7 +63,7 @@ CT_BINUTILS_SRC_DEVEL=y
CT_BINUTILS_DEVEL_VCS_git=y CT_BINUTILS_DEVEL_VCS_git=y
CT_BINUTILS_DEVEL_VCS="git" CT_BINUTILS_DEVEL_VCS="git"
CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_BINUTILS_DEVEL_BRANCH="esp-2021r2-binutils" CT_BINUTILS_DEVEL_BRANCH="esp_based_on_binutils-2_35"
CT_BINUTILS_DEVEL_REVISION="" CT_BINUTILS_DEVEL_REVISION=""
CT_BINUTILS_DEVEL_SUBDIR="" CT_BINUTILS_DEVEL_SUBDIR=""
CT_BINUTILS_DEVEL_BOOTSTRAP="" CT_BINUTILS_DEVEL_BOOTSTRAP=""
@ -74,7 +74,7 @@ CT_GDB_SRC_DEVEL=y
CT_GDB_DEVEL_VCS_git=y CT_GDB_DEVEL_VCS_git=y
CT_GDB_DEVEL_VCS="git" CT_GDB_DEVEL_VCS="git"
CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git" CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
CT_GDB_DEVEL_BRANCH="esp-2021r2-gdb" CT_GDB_DEVEL_BRANCH="esp_based_on_gdb-9"
CT_GDB_DEVEL_REVISION="" CT_GDB_DEVEL_REVISION=""
CT_GDB_DEVEL_SUBDIR="" CT_GDB_DEVEL_SUBDIR=""
CT_GDB_DEVEL_BOOTSTRAP="" CT_GDB_DEVEL_BOOTSTRAP=""

Loading…
Cancel
Save