Skip to content

Commit 11935d2

Browse files
committed
Merge branch 'master' into sync/upstream
2 parents 7c0df27 + feb41ee commit 11935d2

File tree

483 files changed

+16844
-3473
lines changed

Some content is hidden

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

483 files changed

+16844
-3473
lines changed

.circleci/config2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ commands:
1616
"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",
1717
"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",
1818
"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://llvm-gcc-renesas.com/downloads/get.php?f=rx/8.3.0.202004-gnurx/gcc-8.3.0.202004-GNURX-ELF.run",
19+
"rx-gcc": "https://github.com/hathach/rx_device/releases/download/0.0.1/gcc-8.3.0.202411-GNURX-ELF.run",
2020
"arm-iar": "https://updates.iar.com/FileStore/STANDARD/001/003/322/cxarm-9.60.3.deb"
2121
}'
2222
toolchain_url=$(echo $TOOLCHAIN_JSON | jq -r '.["<< parameters.toolchain >>"]')
@@ -114,7 +114,7 @@ commands:
114114
name: Build
115115
command: |
116116
if [ << parameters.toolchain >> == esp-idf ]; then
117-
docker run --rm -v $PWD:/project -w /project espressif/idf:v5.3.1 python tools/build.py << parameters.family >>
117+
docker run --rm -v $PWD:/project -w /project espressif/idf:v5.3.2 python tools/build.py << parameters.family >>
118118
else
119119
# Toolchain option default is gcc
120120
if [ << parameters.toolchain >> == arm-clang ]; then

.github/actions/setup_toolchain/action.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ inputs:
44
toolchain:
55
description: 'Toolchain name'
66
required: true
7-
toolchain_version:
8-
description: 'Toolchain version'
9-
required: false
107

118
outputs:
129
build_option:
@@ -27,7 +24,6 @@ runs:
2724
uses: ./.github/actions/setup_toolchain/espressif
2825
with:
2926
toolchain: ${{ inputs.toolchain }}
30-
toolchain_version: ${{ inputs.toolchain_version }}
3127

3228
- name: Get Toolchain URL
3329
if: >-
@@ -41,7 +37,7 @@ runs:
4137
"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",
4238
"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",
4339
"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",
44-
"rx-gcc": "http://gcc-renesas.com/downloads/get.php?f=rx/8.3.0.202004-gnurx/gcc-8.3.0.202004-GNURX-ELF.run"
40+
"rx-gcc": "https://github.com/hathach/rx_device/releases/download/0.0.1/gcc-8.3.0.202411-GNURX-ELF.run"
4541
}'
4642
TOOLCHAIN_URL=$(echo $TOOLCHAIN_JSON | jq -r '.["${{ inputs.toolchain }}"]')
4743
echo "toolchain_url=$TOOLCHAIN_URL"

.github/actions/setup_toolchain/espressif/action.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ inputs:
66
required: true
77
toolchain_version:
88
description: 'Toolchain version'
9-
required: true
9+
required: false
10+
default: 'v5.3.2'
1011

1112
runs:
1213
using: "composite"
@@ -39,3 +40,9 @@ runs:
3940
du -sh $DOCKER_ESP_IDF
4041
docker load --input $DOCKER_ESP_IDF
4142
shell: bash
43+
44+
- name: Tag Local Image
45+
run: |
46+
docker tag espressif/idf:${{ inputs.toolchain_version }} espressif/idf:tinyusb
47+
docker images
48+
shell: bash

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
runs-on: [self-hosted, Linux, X64, hifiphile]
119119
env:
120120
BUILD_ARGS: ${{ join(fromJSON(needs.set-matrix.outputs.json)['arm-iar'], ' ') }}
121-
# IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
121+
IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
122122
steps:
123123
- name: Clean workspace
124124
run: |

.github/workflows/build_util.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
uses: ./.github/actions/setup_toolchain
4242
with:
4343
toolchain: ${{ inputs.toolchain }}
44-
toolchain_version: 'v5.3.1'
4544

4645
- name: Get Dependencies
4746
uses: ./.github/actions/get_deps
@@ -61,7 +60,7 @@ jobs:
6160
- name: Build
6261
run: |
6362
if [ "${{ inputs.toolchain }}" == "esp-idf" ]; then
64-
docker run --rm -v $PWD:/project -w /project espressif/idf:v5.3.1 python tools/build.py ${{ matrix.arg }}
63+
docker run --rm -v $PWD:/project -w /project espressif/idf:tinyusb python tools/build.py ${{ matrix.arg }}
6564
else
6665
python tools/build.py -s ${{ inputs.build-system }} ${{ steps.setup-toolchain.outputs.build_option }} ${{ steps.set-one-per-family.outputs.build_option }} ${{ matrix.arg }}
6766
fi

.github/workflows/hil_test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
hil-hfp:
9595
if: github.repository_owner == 'hathach'
9696
runs-on: [self-hosted, Linux, X64, hifiphile]
97-
#env:
98-
# IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
97+
env:
98+
IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
9999
steps:
100100
- name: Clean workspace
101101
run: |

.gitignore

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
html
22
latex
3+
*.a
34
*.d
45
*.o
56
*.P
6-
*.map
77
*.axf
88
*.bin
9-
*.jlink
10-
*.emSession
119
*.elf
10+
*.env
1211
*.ind
13-
.env
12+
*.log
13+
*.map
14+
*.obj
15+
*.jlink
16+
*.emSession
17+
*.ninja*
1418
.settings/
1519
.vscode/
1620
.gdb_history

.idea/cmake.xml

+5-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)