Skip to content

build: gcc15 & pico-sdk 2.3.0 #390

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.

Sign up for GitHub

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

Draft
erichelgeson wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

build: gcc15 & pico-sdk 2.3.0 #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ If you use [direnv](https://direnv.net/), the environment loads automatically wh
BlueSCSI uses a forked Pico SDK with Ultra hardware support. Clone it with submodules:

```bash
git clone --recurse-submodules https://github.com/bluescsi/pico-sdk-internal.git -b v2.2.0-UltraSupport-rel2
git clone --recurse-submodules https://github.com/raspberrypi/pico-extras.git -b sdk-2.2.0
git clone --recurse-submodules https://github.com/bluescsi/pico-sdk-internal.git -b v2.3.0-bluescsi
git clone --recurse-submodules https://github.com/raspberrypi/pico-extras.git -b sdk-2.3.0
```

Set the environment variables:
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 25 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,43 @@
pico-sdk = pkgs.fetchFromGitHub {
owner = "bluescsi";
repo = "pico-sdk-internal";
rev = "v2.2.0-UltraSupport-rel2";
rev = "4458968e999258eb527a883ffbc4f184a90a8261"; # v2.3.0-bluescsi
fetchSubmodules = true;
hash = "sha256-Rx+MyFQSHJuIAjClaNXGXt+vhcl0aPP5XGZkzMxLkro=";
hash = "sha256-SexHT0NOhnMSaKPDgudOxl1UciGQPLni+dDJpgRVJcg=";
};

pico-extras = pkgs.fetchFromGitHub {
owner = "raspberrypi";
repo = "pico-extras";
rev = "sdk-2.2.0";
rev = "sdk-2.3.0";
fetchSubmodules = true;
hash = "sha256-AfMycI+CMl76OERyRN8xQer7erh0wxpJnD4fu/Sl18c=";
hash = "sha256-CkxLqfe8uqzz8H8mlY5UQbXJczydGpEyuUyRN/UhoUU=";
};

# tmp till merge in nixpkgs
picotool = pkgs.picotool.overrideAttrs (old: {
version = "2.3.0";
src = pkgs.fetchFromGitHub {
owner = "raspberrypi";
repo = "picotool";
rev = "2.3.0";
hash = "sha256-w9kVCdwevEjc12NNZWztehp6SSgsd9ehSaxqc9sg4O4=";
};
# Our SDK fetch includes the mbedtls submodule, so nixpkgs'
# mbedtls source substitution is unnecessary.
postPatch = "";
cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}" ];
});

pioasm = pkgs.pioasm.overrideAttrs (old: {
version = "2.3.0";
src = pico-sdk;
});
in
{
default = pkgs.mkShell {
packages = with pkgs; [
gcc-arm-embedded-14
gcc-arm-embedded-15
cmake
python3
picotool
Expand Down