diff --git a/starfive/visionfive/v2/firmware.nix b/starfive/visionfive/v2/firmware.nix index 5436009..4072734 100644 --- a/starfive/visionfive/v2/firmware.nix +++ b/starfive/visionfive/v2/firmware.nix @@ -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: { 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 [ ]); diff --git a/starfive/visionfive/v2/uboot.nix b/starfive/visionfive/v2/uboot.nix deleted file mode 100644 index 6fe62a7..0000000 --- a/starfive/visionfive/v2/uboot.nix +++ /dev/null @@ -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" - ]; -}