raspberry-pi/5: add U-Boot packages and an installer #1773
+98
−0
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| { | ||
| lib, | ||
| config, | ||
| pkgs, | ||
| ... | ||
| }: | ||
|
|
||
| let | ||
| uboot = builtins.getAttr (config.hardware.rpiRevision) { | ||
| "rev1.0" = pkgs.ubootRaspberryPi5_rev1_0; | ||
| "rev1.1" = pkgs.ubootRaspberryPi5_rev1_1; | ||
| }; | ||
|
|
||
| configTxt = pkgs.writeText "config.txt" '' | ||
| disable_overscan=1 | ||
| enable_uart=1 | ||
| kernel=u-boot-rpi5.bin | ||
| device_tree=bcm2712-rpi-5-b.dtb | ||
| ''; | ||
| in | ||
| { | ||
| imports = [ | ||
| <nixpkgs/nixos/modules/installer/sd-card/sd-image.nix> | ||
| <nixos-hardware/raspberry-pi/5> | ||
| ]; | ||
|
|
||
| options.hardware.rpiRevision = | ||
| with lib; | ||
| mkOption { | ||
| type = types.enum [ | ||
| "rev1.0" | ||
| "rev1.1" | ||
| ]; | ||
| default = "rev1.0"; | ||
| description = '' | ||
| Select which Raspberry Pi 5 board revision to use. | ||
| ''; | ||
| }; | ||
|
|
||
| config.sdImage = { | ||
| populateFirmwareCommands = '' | ||
| pushd ${pkgs.raspberrypifw}/share/raspberrypi/boot | ||
| # firmware blobs | ||
| cp bootcode.bin fixup*.dat start*.dat $NIX_BUILD_TOP/firmware/ | ||
| # device tree blobs | ||
| cp bcm2712*.dtb $NIX_BUILD_TOP/firmware/ | ||
| popd | ||
| # copy config.txt | ||
| cp ${configTxt} $NIX_BUILD_TOP/firmware/config.txt | ||
| # copy uboot (selectable) | ||
| cp ${uboot}/u-boot.bin $NIX_BUILD_TOP/firmware/u-boot-rpi5.bin | ||
| ''; | ||
|
|
||
| populateRootCommands = '' | ||
| mkdir -p ./files/boot | ||
| ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot | ||
| ''; | ||
| }; | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| final: _prev: { | ||
| ubootRaspberryPi5_rev1_0 = final.buildUBoot { | ||
| defconfig = "rpi_arm64_defconfig"; | ||
| extraMeta.platforms = [ "aarch64-linux" ]; | ||
| filesToInstall = [ "u-boot.bin" ]; | ||
| }; | ||
|
|
||
| ubootRaspberryPi5_rev1_1 = final.buildUBoot { | ||
| defconfig = "rpi_arm64_defconfig"; | ||
| # Mote: this patch can be removed once U-Boot starts setting | ||
| # `fdtfile=bcm2712d0-rpi-5.dtb` automatically for rev1.1 boards | ||
| patches = [ ./uboot-rpi5-bcm2712d0.patch ]; | ||
|
Author
There was a problem hiding this comment. It's something that I'm actually trying to fix with this series: https://lore.kernel.org/u-boot/20260216184452.18732-1-filip.kokosinski@gmail.com/. But they are still under review & testing, so I didn't want to straight up include them here. |
||
| extraMeta.platforms = [ "aarch64-linux" ]; | ||
| filesToInstall = [ "u-boot.bin" ]; | ||
| }; | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c | ||
| index f9b643555dd..f8a8e2b51fe 100644 | ||
| --- a/board/raspberrypi/rpi/rpi.c | ||
| +++ b/board/raspberrypi/rpi/rpi.c | ||
| @@ -192,7 +192,7 @@ static const struct rpi_model rpi_models_new_scheme[] = { | ||
| }, | ||
| [0x17] = { | ||
| "5 Model B", | ||
| - DTB_DIR "bcm2712-rpi-5-b.dtb", | ||
| + DTB_DIR "bcm2712d0-rpi-5-b.dtb", | ||
| true, | ||
| }, | ||
| [0x18] = { |
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably be upstreamed to nixpkgs after this block. It should probably be renamed to
ubootRaspberryPiAarch64likeubootQemuAarch64. WDYT?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea - it looks like doing that in
nixpkgsis fine as long as we use upstream sources, which we do.Upstreaming this in NixOS/nixpkgs#493816.