summary refs log tree commit diff
diff options
context:
space:
mode:
authorVagrant Cascadian <vagrant@debian.org>2018-11-05 21:58:02 +0000
committerDanny Milosavljevic <dannym@scratchpost.org>2018-11-20 23:32:55 +0100
commit725b077e400afec6a34b3494b14e7b899b31ed81 (patch)
tree143ef5873d48246264c0eb4466edcfea5018b238
parentbe02d4df84d859adad5f0dd58eb951a36734b582 (diff)
downloadguix-725b077e400afec6a34b3494b14e7b899b31ed81.tar.gz
gnu: arm-trusted-firmware-pine64-plus: Update to 2.0-1.cabe0a3.
* gnu/packages/firmware.scm (arm-trusted-firmware-pine64-plus):
Use platform name from upstream ("sun50i_a64").
[version]: Update to 2.0-1.cabe0a3,
[source](uri): Use upstream git repository.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
-rw-r--r--gnu/packages/firmware.scm13
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 0b5a82e9e5..90797e013f 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -447,24 +447,25 @@ such as:
                    license:bsd-2)))) ; libfdt
 
 (define-public arm-trusted-firmware-pine64-plus
-  (let ((base (make-arm-trusted-firmware "sun50iw1p1"))
-        ;; Vendor's arm trusted firmware branch hasn't been upstreamed yet.
-        (commit "ae78724247a01560164d607ed66db111c74d8df0")
+  (let ((base (make-arm-trusted-firmware "sun50i_a64"))
+        ;; Use unreleased version which enables additional features needed for
+        ;; LCD support
+        (commit "cabe0a31801e99e7abb84d2114ded6bb56f3c71e")
         (revision "1"))
     (package
       (inherit base)
       (name "arm-trusted-firmware-pine64-plus")
-      (version (string-append "1.2-" revision "." (string-take commit 7)))
+      (version (git-version "2.0" revision commit))
       (source
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/apritzel/arm-trusted-firmware.git")
+                 (url "https://github.com/ARM-software/arm-trusted-firmware.git")
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
            (base32
-            "0r4xnlq7v9khjfcg6gqp7nmrmnw4z1r8bipwdr07png1dcbb8214")))))))
+            "0srw2zj3vn5d2fwzjpwa5h70d5bwvb79jnpdvmd395npv0gxshdz")))))))
 
 (define-public arm-trusted-firmware-puma-rk3399
   (let ((base (make-arm-trusted-firmware "rk3399"))