starfive visionfive2: use upstream u-boot v2024.01-rc5

This commit is contained in:
Nick Cao 2023-12-31 22:43:55 -05:00 committed by mergify[bot]
parent db4589c6aa
commit 637fba0942

View file

@ -1,20 +1,36 @@
{ fetchFromGitHub, buildUBoot }: { lib
, fetchFromGitHub
, buildUBoot
, buildPackages
, opensbi
}:
buildUBoot rec { buildUBoot rec {
version = "5.10.3"; version = "2024.01-rc5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "starfive-tech"; owner = "u-boot";
repo = "u-boot"; repo = "u-boot";
rev = "refs/tags/JH7110_VF2_6.1_v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-4E/AxPCFCluwJBEf6xGuxAi1hPZK5ZxEs5WlBVVfvYE="; hash = "sha256-QlwgvnSaXh39z9AM7HNF731lRiUkPbN3oQyioQNTYFA=";
}; };
# workaround for https://github.com/NixOS/nixpkgs/pull/146634
# uboot: only apply raspberry pi patches to raspberry pi builds
patches = [ ];
extraMakeFlags = [
# workaround for https://github.com/NixOS/nixpkgs/pull/277997
# buildUBoot: specify absolute path of dtc, fix building u-boot 2023.10+
"DTC=${lib.getExe buildPackages.dtc}"
"OPENSBI=${opensbi}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin"
];
defconfig = "starfive_visionfive2_defconfig"; defconfig = "starfive_visionfive2_defconfig";
filesToInstall = [ filesToInstall = [
"u-boot.bin" "spl/u-boot-spl.bin.normal.out"
"arch/riscv/dts/starfive_visionfive2.dtb" "u-boot.itb"
"spl/u-boot-spl.bin"
"tools/mkimage"
]; ];
} }