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

Merge pull request #62800 from lopsided98/uboot-rock64-update

Browse Source 
ubootRock64, ubootRockPro64: update
This commit is contained in:
Samuel Dionne-Riel 2019-06-07 18:42:08 -04:00 committed by GitHub
commit be1f0363aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/uboot/rock64.nix
View File

@ -2,8 +2,8 @@
rkbin = fetchFromGitHub { rkbin = fetchFromGitHub {
owner = "ayufan-rock64"; owner = "ayufan-rock64";
repo = "rkbin"; repo = "rkbin";
rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
}; };
in buildUBoot rec { in buildUBoot rec {
version = "2017.09"; version = "2017.09";
@ -11,11 +11,11 @@ in buildUBoot rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ayufan-rock64"; owner = "ayufan-rock64";
repo = "linux-u-boot"; repo = "linux-u-boot";
rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe";
sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i";
}; };
patches = [ ./rock64-fdt-dtc-compatibility.patch ]; extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ];
extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ]; extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];

14
pkgs/misc/uboot/rockpro64.nix
View File

@ -2,8 +2,8 @@
rkbin = fetchFromGitHub { rkbin = fetchFromGitHub {
owner = "ayufan-rock64"; owner = "ayufan-rock64";
repo = "rkbin"; repo = "rkbin";
rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
}; };
in buildUBoot rec { in buildUBoot rec {
version = "2017.09"; version = "2017.09";
@ -11,17 +11,17 @@ in buildUBoot rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ayufan-rock64"; owner = "ayufan-rock64";
repo = "linux-u-boot"; repo = "linux-u-boot";
rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe";
sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i";
}; };
patches = [ ./rock64-fdt-dtc-compatibility.patch ]; extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ];
# Upstream ATF hangs in SPL # Upstream ATF hangs in SPL
extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.17.elf" "u-boot.itb" "all" ]; extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.25.elf" "u-boot.itb" "all" ];
postBuild = '' postBuild = ''
./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.13.bin idbloader.img ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.19.bin idbloader.img
cat spl/u-boot-spl.bin >> idbloader.img cat spl/u-boot-spl.bin >> idbloader.img
dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc
''; '';