git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #62800 from lopsided98/uboot-rock64-update

ubootRock64, ubootRockPro64: update

commitbe1f0363aa66bd9bb0be11d6e3f90af09e9f237c authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateFri 7 Jun 2019, 18:42 (7 years ago) parent8acf093367dfad
2 files changed+12−12
pkgs/misc/uboot/rock64.nix+5−5 pkgs/misc/uboot/rockpro64.nix+7−7
pkgs/misc/uboot/rock64.nix+5−5
@@ -2,8 +2,8 @@
22 rkbin = fetchFromGitHub {
33 owner = "ayufan-rock64";
44 repo = "rkbin";
5− rev = "af17d09dee19b41f4f01e1722eaf6911fb296245";
6− sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf";
5+ rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
6+ sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
77 };
88in buildUBoot rec {
99 version = "2017.09";
@@ -11,11 +11,11 @@ in buildUBoot rec {
1111 src = fetchFromGitHub {
1212 owner = "ayufan-rock64";
1313 repo = "linux-u-boot";
14− rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c";
15− sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75";
14+ rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe";
15+ sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i";
1616 };
1717
18− patches = [ ./rock64-fdt-dtc-compatibility.patch ];
18+ extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ];
1919
2020 extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];
2121
pkgs/misc/uboot/rockpro64.nix+7−7
@@ -2,8 +2,8 @@
22 rkbin = fetchFromGitHub {
33 owner = "ayufan-rock64";
44 repo = "rkbin";
5− rev = "af17d09dee19b41f4f01e1722eaf6911fb296245";
6− sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf";
5+ rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
6+ sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
77 };
88in buildUBoot rec {
99 version = "2017.09";
@@ -11,17 +11,17 @@ in buildUBoot rec {
1111 src = fetchFromGitHub {
1212 owner = "ayufan-rock64";
1313 repo = "linux-u-boot";
14− rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c";
15− sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75";
14+ rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe";
15+ sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i";
1616 };
1717
18− patches = [ ./rock64-fdt-dtc-compatibility.patch ];
18+ extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ];
1919
2020 # Upstream ATF hangs in SPL
21− extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.17.elf" "u-boot.itb" "all" ];
21+ extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.25.elf" "u-boot.itb" "all" ];
2222
2323 postBuild = ''
24− ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.13.bin idbloader.img
24+ ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.19.bin idbloader.img
2525 cat spl/u-boot-spl.bin >> idbloader.img
2626 dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc
2727 '';