Merge branch 'master' into microsoft-surface/update-kernel-6.18.8
This commit is contained in:
commit
d03c256822
3 changed files with 2 additions and 19 deletions
|
|
@ -9,6 +9,6 @@ pine64/rockpro64 @tomfitzhenry
|
||||||
pine64/star64 @fgaz
|
pine64/star64 @fgaz
|
||||||
purism/librem/13v3 @yegortimoshenko
|
purism/librem/13v3 @yegortimoshenko
|
||||||
system76/darp6 @khumba
|
system76/darp6 @khumba
|
||||||
framework @emiller88
|
framework @emiller88 @johnazoidberg
|
||||||
tuxedo/pulse/15/gen2 @trueNAHO
|
tuxedo/pulse/15/gen2 @trueNAHO
|
||||||
tuxedo/pulse/14/gen3 @gabyx @britter
|
tuxedo/pulse/14/gen3 @gabyx @britter
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ in
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
uboot = (pkgs.callPackage ./uboot.nix { inherit (config.system.build) opensbi; }).overrideAttrs (
|
uboot = (pkgs.ubootVisionFive2.override { inherit (config.system.build) opensbi; }).overrideAttrs (
|
||||||
_f: p: {
|
_f: p: {
|
||||||
src = if cfg.uboot.src != null then cfg.uboot.src else p.src;
|
src = if cfg.uboot.src != null then cfg.uboot.src else p.src;
|
||||||
patches = if cfg.uboot.patches != null then cfg.uboot.patches else (p.patches or [ ]);
|
patches = if cfg.uboot.patches != null then cfg.uboot.patches else (p.patches or [ ]);
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{
|
|
||||||
buildUBoot,
|
|
||||||
opensbi,
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildUBoot {
|
|
||||||
extraMakeFlags = [
|
|
||||||
"OPENSBI=${opensbi}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin"
|
|
||||||
];
|
|
||||||
|
|
||||||
defconfig = "starfive_visionfive2_defconfig";
|
|
||||||
|
|
||||||
filesToInstall = [
|
|
||||||
"spl/u-boot-spl.bin.normal.out"
|
|
||||||
"u-boot.itb"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue