From faf42ffbd07f0c877258c8b519c7e973949f89c7 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 25 Apr 2022 21:33:22 -0700
Subject: [PATCH] ubootRaspberryCM4_64bit: init

---
 nixos/modules/installer/sd-card/sd-image-aarch64.nix | 3 ++-
 pkgs/misc/uboot/default.nix                          | 9 +++++++++
 pkgs/top-level/all-packages.nix                      | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix
index 2289d7af2d3d..1aca8c7e8ecf 100644
--- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix
+++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix
@@ -40,7 +40,7 @@
         arm_boost=1
 
         [cm4]
-        kernel=u-boot-rpi4.bin
+        kernel=u-boot-rpi-cm4.bin
         enable_gic=1
         armstub=armstub8-gic.bin
         disable_overscan=1
@@ -78,6 +78,7 @@
         cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/
 
         # Add cm4 specific files
+        cp ${pkgs.ubootRaspberryPiCM4_64bit}/u-boot.bin firmware/u-boot-rpi-cm4.bin
         cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/
       '';
     populateRootCommands = ''
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 986494e599d1..067d9bbbb5b1 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -437,6 +437,15 @@ in {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootRaspberryPiCM4_64bit = buildUBoot {
+    defconfig = "rpi_4_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    filesToInstall = ["u-boot.bin"];
+    extraConfig = ''
+      CONFIG_USB_XHCI_BRCM=y
+    '';
+  };
+
   ubootRaspberryPiZero = buildUBoot {
     defconfig = "rpi_0_w_defconfig";
     extraMeta.platforms = ["armv6l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3706cc3dc3fb..51539924db14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23775,6 +23775,7 @@ with pkgs;
     ubootRaspberryPi3_64bit
     ubootRaspberryPi4_32bit
     ubootRaspberryPi4_64bit
+    ubootRaspberryPiCM4_64bit
     ubootRaspberryPiZero
     ubootRock64
     ubootRockPi4