From 475dac08a0523e699ee1a69a31f0811ae35b0f81 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 16 Oct 2019 22:29:21 -0700 Subject: gnu: arm-trusted-firmware: Add backported patches to disable .bin generation for rockchip platforms. * gnu/packages/patches/arm-trusted-firmware-optional-bin-generation.patch: New patch. * gnu/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch: New patch. * gnu/packages/firmware (make-arm-trusted-firmware): Add patches. * gnu/local.mk (dist_patch_DATA): Add patches. Signed-off-by: Vagrant Cascadian --- gnu/packages/firmware.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/firmware.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index c473ccd920..3c2b3590e1 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -389,6 +389,9 @@ 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")) (sha256 (base32 "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r")))) -- cgit v1.2.3 From a90fd72bb03ae1644c19b5564e405abcc1086920 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 16 Oct 2019 23:58:51 -0700 Subject: gnu: arm-trusted-firmware: Disable HDCP support which depends on non-free binary blobs. * gnu/packages/firmware (make-arm-trusted-firmware)[source]: Add patch. [arguments] Add phase to remove binary blobs. * gnu/packages/patches/arm-trusted-firmware-disable-hdcp.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add patch. Signed-off-by: Vagrant Cascadian --- gnu/packages/firmware.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/firmware.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 3c2b3590e1..904ed8c5fa 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -391,7 +391,8 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (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-rockchip-disable-binary.patch" + "arm-trusted-firmware-disable-hdcp.patch")) (sha256 (base32 "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r")))) @@ -400,6 +401,12 @@ 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")) -- cgit v1.2.3 From 074554a2891830900e2ff9335799416723094fcb Mon Sep 17 00:00:00 2001 From: Caliph Nomble Date: Mon, 14 Oct 2019 02:01:36 -0400 Subject: gnu: Add arm-trusted-firmware-rk3399. * gnu/packages/bootloaders.scm (arm-trusted-firmware-rk3399): New exported variable. * gnu/packages/firmware (make-arm-trusted-firmware): Also install .elf files. Adjusted-by: Vagrant Cascadian Signed-off-by: Caliph Nomble Signed-off-by: Vagrant Cascadian --- gnu/packages/firmware.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/firmware.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 904ed8c5fa..bfa129aea5 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -410,7 +410,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (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)) @@ -486,6 +486,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") -- cgit v1.2.3 From c07f3b184d6ed81a5f60850fe563092b07784e3b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 19 Aug 2019 21:29:18 +0000 Subject: gnu: Add arm-trusted-firmware-rk3328. * gnu/packages/firmware (arm-trusted-firmware-rk3328): New variable. Signed-off-by: Vagrant Cascadian --- gnu/packages/firmware.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/firmware.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index bfa129aea5..cc92c228ad 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -466,6 +466,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. -- cgit v1.2.3