Skip to content

Commit 7b57b24

Browse files
authored
Merge pull request #8 from ajf58/merge-2.1.0
Update to Pico SDK 2.1.0
2 parents 79ee0f9 + c5d107a commit 7b57b24

File tree

267 files changed

+9497
-2263
lines changed

Some content is hidden

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

267 files changed

+9497
-2263
lines changed

.bazelrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
# Required for new toolchain resolution API.
2-
build --incompatible_enable_cc_toolchain_resolution
3-
build --@rules_cc//cc/toolchains:experimental_enable_rule_based_toolchains
4-
51
# Silence all C/C++ warnings in external code.
62
common --per_file_copt=external/.*@-w
73
common --host_per_file_copt=external/.*@-w

.github/workflows/bazel_build.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Bazel presubmit checks
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
bazel-build-check:
9+
strategy:
10+
matrix:
11+
# TODO: Windows is currently broken.
12+
os: [ubuntu-latest, macos-latest]
13+
fail-fast: false
14+
runs-on: ${{ matrix.os }}
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
- name: Get Bazel
21+
uses: bazel-contrib/setup-bazel@0.9.0
22+
with:
23+
# Avoid downloading Bazel every time.
24+
bazelisk-cache: true
25+
# Store build cache per workflow.
26+
disk-cache: ${{ github.workflow }}
27+
# Share repository cache between workflows.
28+
repository-cache: true
29+
# Only needed to drive the presbumit scripts.
30+
- name: Setup Python
31+
uses: actions/setup-python@v5
32+
with:
33+
python-version: '3.10'
34+
- name: Fetch latest Picotool
35+
uses: actions/checkout@v4
36+
with:
37+
repository: raspberrypi/picotool
38+
ref: develop
39+
fetch-depth: 0
40+
path: lib/picotool
41+
- name: Full Bazel build with develop Picotool
42+
run: python3 tools/run_all_bazel_checks.py --program=build --picotool-dir=lib/picotool
43+
# Checks that the current BCR-requested version of Picotool builds.
44+
- name: Bazel Picotool backwards compatibility
45+
run: bazel build @picotool//:picotool
46+
other-bazel-checks:
47+
runs-on: ubuntu-latest
48+
steps:
49+
- name: Checkout
50+
uses: actions/checkout@v4
51+
with:
52+
fetch-depth: 0
53+
- name: Get Bazel
54+
uses: bazel-contrib/setup-bazel@0.9.0
55+
with:
56+
# Avoid downloading Bazel every time.
57+
bazelisk-cache: true
58+
# Store build cache per workflow.
59+
disk-cache: ${{ github.workflow }}
60+
# Share repository cache between workflows.
61+
repository-cache: true
62+
# Only needed to drive the presbumit scripts.
63+
- name: Setup Python
64+
uses: actions/setup-python@v5
65+
with:
66+
python-version: '3.10'
67+
- name: Fetch latest Picotool
68+
uses: actions/checkout@v4
69+
with:
70+
repository: raspberrypi/picotool
71+
ref: develop
72+
fetch-depth: 0
73+
path: lib/picotool
74+
- name: Other Bazel checks
75+
run: python3 tools/run_all_bazel_checks.py --program=other --picotool-dir=lib/picotool
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="gcc-arm-embedded" version="10.2.1" />
4-
<package id="cmake" version="3.25.2" installArguments="ADD_CMAKE_TO_PATH=System" />
4+
<package id="cmake" version="3.31.0" installArguments="ADD_CMAKE_TO_PATH=System" />
55
<package id="mingw" version="12.2.0" />
66
<package id="ninja" version="1.11.1" />
77
</packages>

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
mkdir -p "${{ github.workspace }}"
2424
2525
- name: Checkout repo
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4
2727

2828
- name: Checkout submodules
2929
run: git submodule update --init

.github/workflows/macOS.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: macos-12
12+
runs-on: macos-latest
1313
steps:
1414
- name: Clean workspace
1515
run: |
1616
echo "Cleaning up previous run"
1717
rm -rf "${{ github.workspace }}"
1818
mkdir -p "${{ github.workspace }}"
1919
- name: Checkout repo
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
- name: Checkout submodules
2222
run: git submodule update --init
2323
- name: Install dependencies

.github/workflows/multi-gcc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
mkdir -p "${{ github.workspace }}"
2121
2222
- name: Checkout repo
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

2525
- name: Checkout submodules
2626
run: git submodule update --init

.github/workflows/scripts/generate_multi_gcc_workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
mkdir -p "${{ github.workspace }}"
5656
5757
- name: Checkout repo
58-
uses: actions/checkout@v2
58+
uses: actions/checkout@v4
5959
6060
- name: Checkout submodules
6161
run: git submodule update --init

.github/workflows/windows.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ jobs:
1717
echo "Cleaning up previous run"
1818
rm -rf "${{ github.workspace }}/pico-sdk"
1919
- name: Checkout repo
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
- name: Checkout submodules
2222
run: git submodule update --init
2323
- name: Install dependencies
2424
run: choco install .github/workflows/choco_packages.config
2525

2626
- name: Build Project
27-
# bash required otherwise this mysteriously (no error) fails at "Generating cyw43_bus_pio_spi.pio.h"
28-
shell: bash
27+
shell: pwsh
2928
run: |
3029
mkdir build
3130
cd build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.idea
22
.vscode
33
cmake-*
4+
.cache
45
.DS_Store
56
build
67
build-*

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ If you are contributing new or updated code please match the existing code style
2222

2323
### Licensing
2424

25-
Code in this repository is lisensed under the [BSD-3 License](LICENSE.TXT). By contributing content to this repository you are agreeing to place your contributions under this licence.
25+
Code in this repository is licensed under the [BSD-3 License](LICENSE.TXT). By contributing content to this repository you are agreeing to place your contributions under this license.

0 commit comments

Comments
 (0)