Skip to content
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.

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

Jump to bottom

Support Raspberry Pi 4 (8 GB) #89717

Merged
merged 5 commits into from Jun 16, 2020
Merged

Support Raspberry Pi 4 (8 GB) #89717

merged 5 commits into from Jun 16, 2020

Conversation

SquircleSpace
Copy link
Contributor

@SquircleSpace SquircleSpace commented Jun 7, 2020 •
edited by samueldr

This change simply bumps the versions for all fetchFromGitHub derivations which pull from the official raspberrypi GitHub repository. The firmware and kernel versions currently being used are too old to support the new 8GB model.

Motivation for this change

NixOS doesn't boot on the 8GB Raspberry Pi 4. See #63720

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

I was able to build an sd-image using the config files from https://github.com/Robertof/nixos-docker-sd-image-builder as a starting point. I made no significant changes to the config file that repo offers as a starting point. I performed the build on the rpi itself while running Ubuntu Server (I was having issues with qemu/docker). The resulting sd-image file successfully booted when loaded onto an SD card.

I did no other testing at all.

Closes #90618
Closes #89659

@ofborg ofborg bot requested review from dezgeg, tkerber, cartr and tavyc June 7, 2020 06:38
@SquircleSpace
Copy link
Contributor Author

@samueldr

@arachnist
Copy link
Contributor

raspberrypi-tools in your patchset tries to apply the tools-dont-install-sysv-init-scripts.patch which doesn't apply anymore - interface/vmcs_host/linux/vcfiled/CMakeLists.txt doesn't exist anymore, and it looks like it won't be needed.

@samueldr
Copy link
Member

samueldr commented Jun 10, 2020 •
edited

The raspberrypifw package has been verified as being compatible with an updated eeprom, and usb boot. (Not yet done with reviewing...)

samueldr
samueldr requested changes Jun 10, 2020
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change is listed in-line, and is as @arachnist said.

Everything else looks alright, though I could not test the following, only built them: rpiboot-unstable, libraspberrypi and raspberrypi-tools.

pkgs/os-specific/linux/firmware/raspberrypi/tools.nix Outdated
rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac";
sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg";
rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74";
sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy";
};

patches = [ ./tools-dont-install-sysv-init-scripts.patch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed anymore. It can be removed entirely, as the thing it patches has been removed from the repo.

@samueldr samueldr mentioned this pull request Jun 11, 2020
Merged
@samueldr samueldr merged commit c62d060 into NixOS:master Jun 16, 2020
Robertof added a commit to Robertof/nixos-docker-sd-image-builder that referenced this pull request Jun 20, 2020
@Robertof
Update instructions for Raspberry Pi 4 w/8GiB of RAM
3ad26d2 
This is now supported upstream (NixOS/nixpkgs#89717)!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr samueldr approved these changes

@dezgeg dezgeg Awaiting requested review from dezgeg

@tkerber tkerber Awaiting requested review from tkerber

@cartr cartr Awaiting requested review from cartr

@tavyc tavyc Awaiting requested review from tavyc

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
No open projects
NixOS on ARM
Awaiting triage
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@SquircleSpace @arachnist @samueldr