ubootRaspberryCM4_64bit: init

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 = ''

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"];

pkgs/top-level/all-packages.nix

@@ -23775,6 +23775,7 @@ with pkgs;
     ubootRaspberryPi3_64bit
     ubootRaspberryPi4_32bit
     ubootRaspberryPi4_64bit
+    ubootRaspberryPiCM4_64bit
     ubootRaspberryPiZero
     ubootRock64
     ubootRockPi4