Skip to content

Commit 1b5f97f

Browse files
hathachhathach
committed
Merge branch 'refs/heads/master' into fork/verylowfreq/pr-ch32v-usbfs-host
2 parents cd2b3a5 + 9d872d5 commit 1b5f97f

File tree

372 files changed

+17656
-8659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

372 files changed

+17656
-8659
lines changed

‎.circleci/config.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ jobs:
1919
echo "MATRIX_JSON=$MATRIX_JSON"
2020
2121
BUILDSYSTEM_TOOLCHAIN=(
22+
"cmake aarch64-gcc"
2223
"cmake arm-clang"
23-
"make aarch64-gcc"
24-
"make arm-gcc"
25-
"make msp430-gcc"
26-
"make riscv-gcc"
27-
"make rx-gcc"
24+
"cmake arm-gcc"
2825
"cmake esp-idf"
26+
"cmake msp430-gcc"
27+
"cmake riscv-gcc"
2928
)
3029
3130
# only build IAR if not forked PR, since IAR token is not shared
@@ -67,7 +66,7 @@ jobs:
6766
FAMILY_LARGE=$(jq -n --argjson family "$FAMILY" --argjson resource "$RESOURCE_LARGE" '$family | map(select(IN($resource[])))')
6867
FAMILY=$(jq -n --argjson family "$FAMILY" --argjson resource "$RESOURCE_LARGE" '$family | map(select(IN($resource[]) | not))')
6968
70-
if [[ $toolchain == esp-idf ]]; then
69+
if [[ $toolchain == esp-idf || $toolchain == arm-iar ]]; then
7170
gen_build_entry "$build_system" "$toolchain" "$FAMILY" "large"
7271
else
7372
gen_build_entry "$build_system" "$toolchain" "$FAMILY" "medium+"

‎.circleci/config2.yml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,7 @@ commands:
1010
- run:
1111
name: Set toolchain url and key
1212
command: |
13-
TOOLCHAIN_JSON='{
14-
"aarch64-gcc": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz",
15-
"arm-clang": "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.1/LLVM-ET-Arm-19.1.1-Linux-x86_64.tar.xz",
16-
"arm-gcc": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v13.2.1-1.1/xpack-arm-none-eabi-gcc-13.2.1-1.1-linux-x64.tar.gz",
17-
"msp430-gcc": "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2",
18-
"riscv-gcc": "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-linux-x64.tar.gz",
19-
"rx-gcc": "https://github.com/hathach/rx_device/releases/download/0.0.1/gcc-8.3.0.202411-GNURX-ELF.run",
20-
"arm-iar": "https://updates.iar.com/FileStore/STANDARD/001/003/322/cxarm-9.60.3.deb"
21-
}'
22-
toolchain_url=$(echo $TOOLCHAIN_JSON | jq -r '.["<< parameters.toolchain >>"]')
23-
13+
toolchain_url=$(jq -r '."<< parameters.toolchain >>"' .github/actions/setup_toolchain/toolchain.json)
2414
# only cache if not a github link
2515
if [[ $toolchain_url != "https://github.com"* ]]; then
2616
echo "<< parameters.toolchain >>-$toolchain_url" > toolchain_key
@@ -121,7 +111,6 @@ commands:
121111
TOOLCHAIN_OPTION="--toolchain clang"
122112
elif [ << parameters.toolchain >> == arm-iar ]; then
123113
TOOLCHAIN_OPTION="--toolchain iar"
124-
echo IAR_LMS_CLOUD_URL=$IAR_LMS_CLOUD_URL
125114
iccarm --version
126115
elif [ << parameters.toolchain >> == arm-gcc ]; then
127116
TOOLCHAIN_OPTION="--toolchain gcc"

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,17 @@ body:
2222
validations:
2323
required: true
2424

25+
- type: input
26+
attributes:
27+
label: Commit SHA
28+
placeholder: e.g 3a042b37da28d0ba1e5593eb1068ca5645d77b56 or version bundled by esp-idf or pico-sdk
29+
validations:
30+
required: true
31+
2532
- type: input
2633
attributes:
2734
label: Board
28-
placeholder: e.g Feather nRF52840 Express
35+
placeholder: e.g Adafruit Feather nRF52840 Express
2936
validations:
3037
required: true
3138

‎.github/actions/setup_toolchain/action.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
if: inputs.toolchain == 'arm-gcc'
1818
uses: carlosperate/arm-none-eabi-gcc-action@v1
1919
with:
20-
release: '13.2.Rel1'
20+
release: '14.2.Rel1'
2121

2222
- name: Pull ESP-IDF docker
2323
if: inputs.toolchain == 'esp-idf'
@@ -28,26 +28,17 @@ runs:
2828
- name: Get Toolchain URL
2929
if: >-
3030
inputs.toolchain != 'arm-gcc' &&
31-
inputs.toolchain != 'arm-iar' &&
3231
inputs.toolchain != 'esp-idf'
3332
id: set-toolchain-url
3433
run: |
35-
TOOLCHAIN_JSON='{
36-
"aarch64-gcc": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz",
37-
"arm-clang": "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.1/LLVM-ET-Arm-19.1.1-Linux-x86_64.tar.xz",
38-
"msp430-gcc": "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2",
39-
"riscv-gcc": "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-linux-x64.tar.gz",
40-
"rx-gcc": "https://github.com/hathach/rx_device/releases/download/0.0.1/gcc-8.3.0.202411-GNURX-ELF.run"
41-
}'
42-
TOOLCHAIN_URL=$(echo $TOOLCHAIN_JSON | jq -r '.["${{ inputs.toolchain }}"]')
34+
TOOLCHAIN_URL=$(jq -r '."${{ inputs.toolchain }}"' .github/actions/setup_toolchain/toolchain.json)
4335
echo "toolchain_url=$TOOLCHAIN_URL"
4436
echo "toolchain_url=$TOOLCHAIN_URL" >> $GITHUB_OUTPUT
4537
shell: bash
4638

4739
- name: Download Toolchain
4840
if: >-
4941
inputs.toolchain != 'arm-gcc' &&
50-
inputs.toolchain != 'arm-iar' &&
5142
inputs.toolchain != 'esp-idf'
5243
uses: ./.github/actions/setup_toolchain/download
5344
with:

‎.github/actions/setup_toolchain/download/action.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,25 @@ runs:
2323
if: steps.cache-toolchain-download.outputs.cache-hit != 'true'
2424
run: |
2525
mkdir -p ~/cache/${{ inputs.toolchain }}
26-
wget --progress=dot:giga ${{ inputs.toolchain_url }} -O toolchain.tar.gz
26+
2727
if [[ ${{ inputs.toolchain }} == rx-gcc ]]; then
28-
mv toolchain.tar.gz toolchain.run
28+
wget --progress=dot:giga ${{ inputs.toolchain_url }} -O toolchain.run
2929
chmod +x toolchain.run
3030
./toolchain.run -p ~/cache/${{ inputs.toolchain }}/gnurx -y
31+
elif [[ ${{ inputs.toolchain }} == arm-iar ]]; then
32+
wget --progress=dot:giga ${{ inputs.toolchain_url }} -O ~/cache/${{ inputs.toolchain }}/cxarm.deb
3133
else
34+
wget --progress=dot:giga ${{ inputs.toolchain_url }} -O toolchain.tar.gz
3235
tar -C ~/cache/${{ inputs.toolchain }} -xaf toolchain.tar.gz
3336
fi
3437
shell: bash
3538

36-
- name: Set Toolchain Path
39+
- name: Setup Toolchain
3740
run: |
38-
echo >> $GITHUB_PATH `echo ~/cache/${{ inputs.toolchain }}/*/bin`
41+
if [[ ${{ inputs.toolchain }} == arm-iar ]]; then
42+
sudo apt-get install -y ~/cache/${{ inputs.toolchain }}/cxarm.deb
43+
echo >> $GITHUB_PATH "/opt/iar/cxarm/arm/bin"
44+
else
45+
echo >> $GITHUB_PATH `echo ~/cache/${{ inputs.toolchain }}/*/bin`
46+
fi
3947
shell: bash

‎.github/actions/setup_toolchain/toolchain.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"aarch64-gcc": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz",
3+
"arm-clang": "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.1/LLVM-ET-Arm-19.1.1-Linux-x86_64.tar.xz",
4+
"arm-gcc": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v14.2.1-1.1/xpack-arm-none-eabi-gcc-14.2.1-1.1-linux-x64.tar.gz",
5+
"msp430-gcc": "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2",
6+
"riscv-gcc": "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-linux-x64.tar.gz",
7+
"rx-gcc": "https://github.com/hathach/rx_device/releases/download/0.0.1/gcc-8.3.0.202411-GNURX-ELF.run",
8+
"arm-iar": "https://netstorage.iar.com/FileStore/STANDARD/001/003/583/cxarm-9.60.4.deb"
9+
}

0 commit comments

Comments
 (0)