colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #297954 from K900/uboot-rk3588-fixups 

Some small uboot/rkbin fixes for RK3588
This commit is contained in:
K900 2024-03-22 09:28:03 +03:00 committed by GitHub
parent 0ebdaea977 1db686b48b
commit 455e307452
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 8 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
, 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" ];
};

12
pkgs/misc/uboot/default.nix
View File

@ -377,8 +377,14 @@ in {
defconfig = "orangepi-5-rk3588s_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
ROCKCHIP_TPL = "${rkbin}/${rkbin.ROCKCHIP_TPL_RK3588}";
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ];
ROCKCHIP_TPL = rkbin.TPL_RK3588;
# FIXME: applied upstream, remove in 2024.04
extraConfig = ''
CONFIG_ROCKCHIP_SPI_IMAGE=y
'';
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
};
ubootOrangePiPc = buildUBoot {
@ -529,7 +535,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" ];
};