swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

rkbin: make passthru attributes use full paths, fix license, fix BL31_RK3568 path

Browse source
This commit is contained in:
K900 2024-03-22 08:46:57 +03:00
parent 0ebdaea977
commit 8502a2a6b5
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/by-name/rk/rkbin/package.nix
View file

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, rkbin
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -19,15 +20,16 @@ stdenv.mkDerivation {
mv bin doc $out/ mv bin doc $out/
''; '';
BL31_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin"; passthru = {
ROCKCHIP_TPL_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin"; BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.44.elf";
TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.21.bin";
ROCKCHIP_TPL_RK3588 = "bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"; TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin";
};
meta = with lib; { meta = with lib; {
description = "Rockchip proprietary bootloader blobs"; description = "Rockchip proprietary bootloader blobs";
homepage = "https://github.com/rockchip-linux/rkbin"; homepage = "https://github.com/rockchip-linux/rkbin";
license = licenses.unfree; license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ thefossguy ]; maintainers = with maintainers; [ thefossguy ];
platforms = [ "aarch64-linux" ]; platforms = [ "aarch64-linux" ];
}; };

4
pkgs/misc/uboot/default.nix
View file

@ -377,7 +377,7 @@ in {
defconfig = "orangepi-5-rk3588s_defconfig"; defconfig = "orangepi-5-rk3588s_defconfig";
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; 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" ]; filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ];
}; };
@ -529,7 +529,7 @@ in {
defconfig = "rock5b-rk3588_defconfig"; defconfig = "rock5b-rk3588_defconfig";
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; 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" ]; filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
}; };