diff --git a/hacks/orangepi5plus/uboot/default.nix b/hacks/orangepi5plus/uboot/default.nix index 5c128ca..6f9554e 100644 --- a/hacks/orangepi5plus/uboot/default.nix +++ b/hacks/orangepi5plus/uboot/default.nix @@ -1,7 +1,7 @@ { fetchFromGitLab, fetchFromGitHub, - buildArmTrustedFirmware, + #buildArmTrustedFirmware, buildUBoot, }: let rkbin = fetchFromGitHub { @@ -10,23 +10,22 @@ rev = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0"; hash = "sha256-U/jeUsV7bhqMw3BljmO6SI07NCDAd/+sEp3dZnyXeeA="; }; - - tfa = - (buildArmTrustedFirmware rec { - extraMakeFlags = ["bl31"]; - platform = "rk3588"; - extraMeta.platforms = ["aarch64-linux"]; - filesToInstall = ["build/${platform}/release/bl31/bl31.elf"]; - }) - .overrideAttrs (_: { - src = fetchFromGitLab { - domain = "gitlab.collabora.com"; - owner = "hardware-enablement"; - repo = "rockchip-3588/trusted-firmware-a"; - rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701"; - hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg="; - }; - }); + #tfa = + # (buildArmTrustedFirmware rec { + # extraMakeFlags = ["bl31"]; + # platform = "rk3588"; + # extraMeta.platforms = ["aarch64-linux"]; + # filesToInstall = ["build/${platform}/release/bl31/bl31.elf"]; + # }) + # .overrideAttrs (_: { + # src = fetchFromGitLab { + # domain = "gitlab.collabora.com"; + # owner = "hardware-enablement"; + # repo = "rockchip-3588/trusted-firmware-a"; + # rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701"; + # hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg="; + # }; + # }); in buildUBoot rec { version = "v2024.04-rc3-52-g773cb2bca7"; @@ -43,7 +42,7 @@ in patches = []; 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 extraMakeFlags = ["DTC=./scripts/dtc/dtc"];