-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
dist/tools/esptools: upgrade ESP32x toolchains to GCC version 12.2 #19452
dist/tools/esptools: upgrade ESP32x toolchains to GCC version 12.2 #19452
Conversation
4669023
to
4ead466
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. Please fix and squash the CI nitpicks (see inline comments) prior merge.
dist/tools/esptools/export.sh
Outdated
echo "error: Unknown platform $1, use xtensa or riscv" | ||
return | ||
esac | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dist/tools/esptools/export.sh
Outdated
esac | ||
|
||
GDB_VERSION="12.1_20221002" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dist/tools/esptools/export.sh
Outdated
GDB_VERSION="12.1_20221002" | ||
|
||
TOOLS_DIR=${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH} | ||
TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | |
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
dist/tools/esptools/export.sh
Outdated
TOOLS_DIR=${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH} | ||
TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
|
||
if [ -e ${TOOLS_DIR} ] && [ -z ${TOOLS_DIR_IN_PATH} ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if [ -e ${TOOLS_DIR} ] && [ -z ${TOOLS_DIR_IN_PATH} ]; then | |
if [ -e "${TOOLS_DIR}" ] && [ -z "${TOOLS_DIR_IN_PATH}" ]; then |
dist/tools/esptools/export.sh
Outdated
|
||
if [ -e ${TOOLS_DIR} ] && [ -z ${TOOLS_DIR_IN_PATH} ]; then | ||
echo "Extending PATH by ${TOOLS_DIR}/bin" | ||
export PATH=${TOOLS_DIR}/bin:${PATH} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
export PATH=${TOOLS_DIR}/bin:${PATH} | |
export PATH="${TOOLS_DIR}/bin:${PATH}" |
dist/tools/esptools/export.sh
Outdated
|
||
unset TOOLS_DIR | ||
} | ||
|
||
if [ -z $1 ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if [ -z $1 ]; then | |
if [ -z "$1" ]; then |
dist/tools/esptools/export.sh
Outdated
echo "tool = all | esp32 | esp32c3 | esp32s2 | esp32s3 | openocd | qemu" | ||
echo " export.sh gdb <platform>" | ||
echo "<tool> = all | esp32 | esp32c3 | esp32s2 | esp32s3 | gdb | openocd | qemu" | ||
echo "<platform> = xtensa | riscv" | ||
elif [ "$1" = "all" ]; then | ||
ARCH_ALL="esp32 esp32c3 esp32s2 esp32s3" | ||
for arch in ${ARCH_ALL}; do | ||
export_arch $arch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
export_arch $arch | |
export_arch "$arch" |
dist/tools/esptools/export.sh
Outdated
echo "platform required: xtensa | riscv" | ||
exit 1 | ||
fi | ||
export_gdb $2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
export_gdb $2 | |
export_gdb "$2" |
dist/tools/esptools/install.sh
Outdated
echo "error: Unknown platform $1, use xtensa or riscv" | ||
exit 1 | ||
esac | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dist/tools/esptools/install.sh
Outdated
esac | ||
|
||
GDB_VERSION="12.1_20221002" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CI still has more nitpicks :-/
Please squash at will
TOOLS_DIR=${TOOLS_PATH}/${TARGET_ARCH}/${ESP32_GCC_RELEASE}-${ESP32_GCC_VERSION_DIR}/${TARGET_ARCH} | ||
TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
TOOLS_DIR="${TOOLS_PATH}/${TARGET_ARCH}/${ESP32_GCC_RELEASE}/${TARGET_ARCH}" | ||
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
OPENOCD_DIR=${TOOLS_DIR}/openocd-esp32 | ||
TOOLS_DIR="${TOOLS_PATH}/openocd-esp32/${ESP32_OPENOCD_VERSION}" | ||
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
TOOLS_DIR=${TOOLS_PATH}/qemu-esp32/${ESP32_QEMU_VERSION}/qemu | ||
TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
TOOLS_DIR="${TOOLS_PATH}/qemu-esp32/${ESP32_QEMU_VERSION}/qemu" | ||
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
GDB_VERSION="12.1_20221002" | ||
|
||
TOOLS_DIR="${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH}" | ||
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
GDB_VERSION="12.1_20221002" | ||
|
||
TOOLS_DIR="${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH}" | ||
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
GDB_VERSION="12.1_20221002" | ||
|
||
TOOLS_DIR="${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH}" | ||
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
I think we can merge this now if static tests are satisfied. |
53b7ebb
to
a83d5ba
Compare
I tested all apps on the |
bors merge |
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page. |
Contribution description
This PR upgrades ESP32x toolchains to GCC version 12.2 which is a prerequisite for upgrading the ESP-IDF to version 5.1.
This PR depends on PR #19450
Testing procedure
dist/tools/install.sh all
should install all ESP32x toolchains.. dist/tools/export.sh all
should make them visible.Issues/PRs references
Depends on PR #19450