From 1bb093e4ff017737b6665b0465a88968d2af279f Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 6 Jun 2019 22:58:34 -0400
Subject: [PATCH] ubootRock64: update U-Boot and rkbin

---
 pkgs/misc/uboot/rock64.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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