diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-04-25 21:33:22 -0700 |
|---|---|---|
| committer | Bernardo Meurer <bernardo@meurer.org> | 2022-04-25 21:33:22 -0700 |
| commit | d6ae2c696cb7fc5a3d8e74b78545da801c8787cb (patch) | |
| tree | 99dc1ed40befbfe1b3fd72383eb3d05fc91df26f | |
| parent | sd-image-aarch64: add support for the RaspberryPi CM4 (diff) | |
| download | nixpkgs-d6ae2c696cb7fc5a3d8e74b78545da801c8787cb.tar.gz | |
ubootRaspberryCM4_64bit: init
| -rw-r--r-- | nixos/modules/installer/sd-card/sd-image-aarch64.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 12 insertions, 1 deletions
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 7891eca6e4f2..db90fe4cad4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23762,6 +23762,7 @@ with pkgs; ubootRaspberryPi3_64bit ubootRaspberryPi4_32bit ubootRaspberryPi4_64bit + ubootRaspberryPiCM4_64bit ubootRaspberryPiZero ubootRock64 ubootRockPi4 |