diff options
| -rw-r--r-- | pkgs/by-name/rk/rkbin/package.nix | 12 | ||||
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/by-name/rk/rkbin/package.nix b/pkgs/by-name/rk/rkbin/package.nix index f0d320dfef954..9ccff94a4e4b1 100644 --- a/pkgs/by-name/rk/rkbin/package.nix +++ b/pkgs/by-name/rk/rkbin/package.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, rkbin }: stdenv.mkDerivation { @@ -19,15 +20,16 @@ stdenv.mkDerivation { mv bin doc $out/ ''; - BL31_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin"; - ROCKCHIP_TPL_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin"; - - ROCKCHIP_TPL_RK3588 = "bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"; + passthru = { + BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.44.elf"; + TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.21.bin"; + TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"; + }; meta = with lib; { description = "Rockchip proprietary bootloader blobs"; homepage = "https://github.com/rockchip-linux/rkbin"; - license = licenses.unfree; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ thefossguy ]; platforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 484bcf08988eb..8247ec24f547f 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -377,7 +377,7 @@ in { defconfig = "orangepi-5-rk3588s_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; - ROCKCHIP_TPL = "${rkbin}/${rkbin.ROCKCHIP_TPL_RK3588}"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; }; @@ -529,7 +529,7 @@ in { defconfig = "rock5b-rk3588_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; - ROCKCHIP_TPL = "${rkbin}/${rkbin.ROCKCHIP_TPL_RK3588}"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; |