diff options
| author | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
|---|---|---|
| committer | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
| commit | cb0f1d98db3c4bcfdcba231a78b1c18805483ad8 (patch) | |
| tree | fa88fc9cb41a59a2089ea2e43d8feac2b8987474 /.github/workflows | |
| parent | 970da35fb303f1aa44e6279b14b80418f3250f60 (diff) | |
| parent | 6e939de9d673979721b83b0b3ab724ebd652770c (diff) | |
Merge remote-tracking branch 'origin/master' into CCRX_Port
# Conflicts:
# src/portable/renesas/usba/dcd_usba.c
# src/tusb_option.h
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/build_esp.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/build_renesas.yml | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e149dc65..fc5b92b68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,8 +49,7 @@ jobs: - 'samd11' - 'samd21' - 'samd51' - - 'saml21' - - 'saml22' + - 'saml2x' - 'stm32f0' - 'stm32f4' - 'stm32f7' diff --git a/.github/workflows/build_esp.yml b/.github/workflows/build_esp.yml index 08bb4f5d2..25f4e68f8 100644 --- a/.github/workflows/build_esp.yml +++ b/.github/workflows/build_esp.yml @@ -16,10 +16,10 @@ jobs: board: # Alphabetical order # ESP32-S2 - - 'adafruit_metro_esp32s2' - 'espressif_saola_1' # ESP32-S3 - - 'espressif_addax_1' + # latest IDF does not define USB0 in linker + #- 'espressif_addax_1' steps: - name: Setup Python diff --git a/.github/workflows/build_renesas.yml b/.github/workflows/build_renesas.yml index 45e0c5fd5..ee9ba8289 100644 --- a/.github/workflows/build_renesas.yml +++ b/.github/workflows/build_renesas.yml @@ -15,7 +15,7 @@ jobs: matrix: family: # Alphabetical order - - 'rx63n' + - 'rx' steps: - name: Setup Python uses: actions/setup-python@v2 |