From d57972961cb454a66ffbc26a44860b57e78efbf1 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 30 Dec 2021 19:30:21 -0800 Subject: [PATCH] ubootRaspberryPi3_{32,64}bit: Add patch to load correct DT for Pi Zero 2 W --- pkgs/misc/uboot/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index e287066ddb9c..5d7a344088ef 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -395,12 +395,28 @@ in { defconfig = "rpi_3_32b_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; + extraPatches = [ + # Remove when updating to 2022.01 + # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/273129/mbox/"; + sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; + }) + ]; }; ubootRaspberryPi3_64bit = buildUBoot { defconfig = "rpi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; + extraPatches = [ + # Remove when updating to 2022.01 + # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/273129/mbox/"; + sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; + }) + ]; }; ubootRaspberryPi4_32bit = buildUBoot {