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.

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

Jump to bottom

ubootRaspberryPi4: backport fix for C0 revisions #139865

Closed
wants to merge 1 commit into from
Closed

ubootRaspberryPi4: backport fix for C0 revisions #139865

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
11 changes: 11 additions & 0 deletions pkgs/misc/uboot/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ let
} // extraMeta;
} // removeAttrs args [ "extraMeta" ]);

# Make U-Boot forward some important settings from the firmware-provided FDT. Fixes booting on BCM2711C0 boards.
# See also: https://github.com/NixOS/nixpkgs/issues/135828
# Source: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/
pi4ExtraPatches = [
(fetchpatch {
url = "https://patchwork.ozlabs.org/series/259129/mbox/";
samueldr marked this conversation as resolved.
Show resolved Hide resolved
sha256 = "04x55a62a5p4mv0ddpx7dnsh5pnx46vibnq8cry7hgwf4krl64gl";
})
];
in {
inherit buildUBoot;

Expand Down Expand Up @@ -355,12 +364,14 @@ in {
ubootRaspberryPi4_32bit = buildUBoot {
defconfig = "rpi_4_32b_defconfig";
extraMeta.platforms = ["armv7l-linux"];
extraPatches = pi4ExtraPatches;
filesToInstall = ["u-boot.bin"];
};

ubootRaspberryPi4_64bit = buildUBoot {
defconfig = "rpi_4_defconfig";
extraMeta.platforms = ["aarch64-linux"];
extraPatches = pi4ExtraPatches;
filesToInstall = ["u-boot.bin"];
};

Expand Down