aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/firmware.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2019-11-16 09:34:27 +0100
committerMathieu Othacehe <m.othacehe@gmail.com>2019-11-16 09:34:27 +0100
commit154d97abdd16674fdebc763351f661bbcdc869a4 (patch)
tree0277a9380edd1390f16e432283d32499ffed36d1 /gnu/packages/firmware.scm
parente4696c69d75f4fcf54c42beeb928032726bdaf7d (diff)
parent87e7faa2ae641d8302efc8b90f1e45f43f67f6da (diff)
downloadguix-154d97abdd16674fdebc763351f661bbcdc869a4.tar
guix-154d97abdd16674fdebc763351f661bbcdc869a4.tar.gz
Merge remote-tracking branch master into core-updates
Diffstat (limited to 'gnu/packages/firmware.scm')
-rw-r--r--gnu/packages/firmware.scm25
1 files changed, 24 insertions, 1 deletions
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 3104d78b39..467a676faf 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -390,6 +390,10 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(url "https://github.com/ARM-software/arm-trusted-firmware.git")
(commit (string-append "v" version))))
(file-name (git-file-name "arm-trusted-firmware" version))
+ (patches (search-patches
+ "arm-trusted-firmware-optional-bin-generation.patch"
+ "arm-trusted-firmware-rockchip-disable-binary.patch"
+ "arm-trusted-firmware-disable-hdcp.patch"))
(sha256
(base32
"1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r"))))
@@ -398,10 +402,16 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
`(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
+ ;; Remove binary blobs which do not contain source or proper license.
+ (add-after 'unpack 'remove-binary-blobs
+ (lambda _
+ (for-each (lambda (file)
+ (delete-file file))
+ (find-files "." ".*\\.bin$"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
- (bin (find-files "." ".*\\.bin$")))
+ (bin (find-files "." ".*\\.(bin|elf)$")))
(for-each
(lambda (file)
(install-file file out))
@@ -457,6 +467,9 @@ such as:
(inherit base)
(name "arm-trusted-firmware-sun50i-a64"))))
+(define-public arm-trusted-firmware-rk3328
+ (make-arm-trusted-firmware "rk3328"))
+
(define-public arm-trusted-firmware-puma-rk3399
(let ((base (make-arm-trusted-firmware "rk3399"))
;; Vendor's arm trusted firmware branch hasn't been upstreamed yet.
@@ -477,6 +490,16 @@ such as:
(base32
"0vqhwqqh8h9qlkpybg2v94911091c1418bc4pnzq5fd7zf0fjkf8")))))))
+(define-public arm-trusted-firmware-rk3399
+ (let ((base (make-arm-trusted-firmware "rk3399")))
+ (package
+ (inherit base)
+ (name "arm-trusted-firmware-rk3399")
+ (native-inputs
+ `(("cross32-gcc" ,(cross-gcc "arm-none-eabi"))
+ ("cross32-binutils", (cross-binutils "arm-none-eabi"))
+ ,@(package-native-inputs base))))))
+
(define-public rk3399-cortex-m0
(package
(name "rk3399-cortex-m0")