raspberrypi-bootloader: allow custom target directory and support 64-bit Raspberry Pi 3 #47250
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 tasks
NixOS is unable to boot using the RPi bootloader (w/o U-Boot) unless the initrd is configured.
|
I added a commit that configures the initrd when not using U-Boot. I have had this in my local config for a long time, but I decided to add it to this PR because, AFAIK, it is not possible to boot directly from the RPi bootloader without this line. This seems to mean that either no one uses the RPi bootloader directly, or everyone has figured out the workaround and applied it to their own config. |
|
@dezgeg Could you take a look at this when you get a chance? |
dezgeg
reviewed
Oct 21, 2018
| @@ -1,13 +1,15 @@ | |||
| { config, pkgs, configTxt }: | |||
| { pkgs, version, configTxt }: | |||
|
|
|||
| let | |||
| cfg = config.boot.loader.raspberryPi; | |||
There was a problem hiding this comment.
I dropped this line when applying to make it evaluate.
There was a problem hiding this comment.
Oops, sorry, I had fixed this on my production branch, but I forgot to apply it to the PR.
|
Sorry for the delay, now applied in: https://git.io/fxKVd |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This PR is the collection of changes needed to get my Raspberry Pis to boot in the variety of configurations I use. I needed to be able to generate SD card images for Pi Zeroes that used the RPi bootloader without U-Boot (to support DT overlays), and a Pi 1 using U-Boot. I also needed to support the Raspberry Pi 3 in 64-bit mode w/o U-Boot (again for DT overlays).
Things done
I refactored (and renamed) the RPi bootloader builder scripts to be more like the
generic-extlinux-compatiblebuilder. They now take an argument specifying the target directory, allowing them to be used insdImage.populateBootCommands. For the RPi bootloader builder, I had to change the logic a bit to allow writing a default generation when there were no generations in the system profile (when building an SD card image). The changes to the U-Boot builder should make it possible to useboot.loader.raspberryPi.ubootinstead ofboot.loader.generic-extlinux-compatiblein the NixOS SD images, but this PR does not do that. See here for an example of how I generate SD card images for my Pi Zeroes.This PR also allows a 64-bit kernel to be booted on the Pi 3 without U-Boot. The problem was that the kernel was written to
/boot/kernel7.img, while the Pi was looking forkernel8.img. This PR causes the kernel to always be written tokernel.imgand adds a line toconfig.txtexplicitly specifying that location. I also had to copy the device trees from the correct location in the 64 bit kernel.While I was at it, I also added
0as a allowable value forboot.loader.raspberryPi.versionwhich causes the correct U-Boot build to be used. The RPi 1 U-Boot generally works fine on the Zero, so this change isn't that important.Some possible issues with this PR are that Pi 2 and 3 users will have unused
kernel7.imgfiles in/boot, which will take up the limited space in/bootand will have to be deleted manually. Also/boot/defaultgenerationis no longer created (because there are now files nameddefault-{cmdline.txt,init,initrd,kernel,system}in/boot/oldwhich serve the same purpose), but the existing file is not deleted, which might confuse users.cc @dezgeg
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)