diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-07-11 15:15:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-11 15:15:32 -0400 |
| commit | 14df81c809e950da1c7356984abf0ff367a94136 (patch) | |
| tree | 6adbecdafbc5e2cf4e3414aab207f8c123bccae1 | |
| parent | 1fdd3cc60d4d9cf1037589ef5d5a2cceef9d4460 (diff) | |
| parent | 1dec71e52a2e71974d01a525f82a34f7c83869cd (diff) | |
| download | nixpkgs-14df81c809e950da1c7356984abf0ff367a94136.tar nixpkgs-14df81c809e950da1c7356984abf0ff367a94136.tar.gz nixpkgs-14df81c809e950da1c7356984abf0ff367a94136.tar.bz2 nixpkgs-14df81c809e950da1c7356984abf0ff367a94136.tar.lz nixpkgs-14df81c809e950da1c7356984abf0ff367a94136.tar.xz nixpkgs-14df81c809e950da1c7356984abf0ff367a94136.tar.zst nixpkgs-14df81c809e950da1c7356984abf0ff367a94136.zip | |
Merge pull request #125730 from ck3d/fix-uboot-preboot
ubootRockPro64: Fix boot hanging
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 3d7e9e48eb3..71f3e13fc90 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -401,6 +401,13 @@ in { ubootRockPro64 = buildUBoot { extraMakeFlags = [ "all" "u-boot.itb" ]; + extraPatches = [ + # https://patchwork.ozlabs.org/project/uboot/list/?series=237654&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/237654/mbox/"; + sha256 = "0aiw9zk8w4msd3v8nndhkspjify0yq6a5f0zdy6mhzs0ilq896c3"; + }) + ]; defconfig = "rockpro64-rk3399_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31="${armTrustedFirmwareRK3399}/bl31.elf"; |