uboot: use binary bl31

This commit is contained in:
Motiejus Jakštys 2024-03-07 20:59:58 +02:00
parent b1d1632295
commit 0d7e143864

View File

@ -1,7 +1,7 @@
{ {
fetchFromGitLab, fetchFromGitLab,
fetchFromGitHub, fetchFromGitHub,
buildArmTrustedFirmware, #buildArmTrustedFirmware,
buildUBoot, buildUBoot,
}: let }: let
rkbin = fetchFromGitHub { rkbin = fetchFromGitHub {
@ -10,23 +10,22 @@
rev = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0"; rev = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0";
hash = "sha256-U/jeUsV7bhqMw3BljmO6SI07NCDAd/+sEp3dZnyXeeA="; hash = "sha256-U/jeUsV7bhqMw3BljmO6SI07NCDAd/+sEp3dZnyXeeA=";
}; };
#tfa =
tfa = # (buildArmTrustedFirmware rec {
(buildArmTrustedFirmware rec { # extraMakeFlags = ["bl31"];
extraMakeFlags = ["bl31"]; # platform = "rk3588";
platform = "rk3588"; # extraMeta.platforms = ["aarch64-linux"];
extraMeta.platforms = ["aarch64-linux"]; # filesToInstall = ["build/${platform}/release/bl31/bl31.elf"];
filesToInstall = ["build/${platform}/release/bl31/bl31.elf"]; # })
}) # .overrideAttrs (_: {
.overrideAttrs (_: { # src = fetchFromGitLab {
src = fetchFromGitLab { # domain = "gitlab.collabora.com";
domain = "gitlab.collabora.com"; # owner = "hardware-enablement";
owner = "hardware-enablement"; # repo = "rockchip-3588/trusted-firmware-a";
repo = "rockchip-3588/trusted-firmware-a"; # rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701";
rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701"; # hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg=";
hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg="; # };
}; # });
});
in in
buildUBoot rec { buildUBoot rec {
version = "v2024.04-rc3-52-g773cb2bca7"; version = "v2024.04-rc3-52-g773cb2bca7";
@ -43,7 +42,7 @@ in
patches = []; patches = [];
ROCKCHIP_TPL = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"; ROCKCHIP_TPL = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin";
BL31 = "${tfa}/bl31.elf"; BL31 = "${rkbin}/bin/rk35/rk3588_bl31_v1.45.elf";
# FIXME: seems to not like nixpkgs dtc for some reason # FIXME: seems to not like nixpkgs dtc for some reason
extraMakeFlags = ["DTC=./scripts/dtc/dtc"]; extraMakeFlags = ["DTC=./scripts/dtc/dtc"];