diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 1aca8c7e8ecf..7825a47814c3 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-rpi-cm4.bin + kernel=u-boot-rpi4.bin enable_gic=1 armstub=armstub8-gic.bin disable_overscan=1 @@ -76,9 +76,6 @@ cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin 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 d231dcef8979..92b03e7d863b 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -412,12 +412,6 @@ in { defconfig = "rpi_4_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; - }; - - ubootRaspberryPiCM4_64bit = buildUBoot { - defconfig = "rpi_4_defconfig"; - extraMeta.platforms = ["aarch64-linux"]; - filesToInstall = ["u-boot.bin"]; extraConfig = '' CONFIG_CMD_NVME=y CONFIG_NVME=y diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51539924db14..3706cc3dc3fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23775,7 +23775,6 @@ with pkgs; ubootRaspberryPi3_64bit ubootRaspberryPi4_32bit ubootRaspberryPi4_64bit - ubootRaspberryPiCM4_64bit ubootRaspberryPiZero ubootRock64 ubootRockPi4