From 95d91986064ef2b03d8c55286e47d2a2280db152 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 14 Nov 2018 16:53:14 +0000 Subject: gnu: arm-trusted-firmware-pine64-plus: Rename variable to arm-trusted-firmware-sun50i-a64. * gnu/packages/firmware (arm-trusted-firmware-pine64-plus): Rename to... (arm-trusted-firmware-sun50i-a64): ...this. * gnu/packages/bootloaders (u-boot-pine64-plus)[native-inputs]: Use it. Signed-off-by: Danny Milosavljevic --- gnu/packages/bootloaders.scm | 2 +- gnu/packages/firmware.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2fa50a89b4..3e4c8bb0bc 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -573,7 +573,7 @@ (define-public u-boot-pine64-plus ) #t)))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-pine64-plus) + `(("firmware" ,arm-trusted-firmware-sun50i-a64) ,@(package-native-inputs base)))))) (define-public u-boot-bananapi-m2-ultra diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 90797e013f..c396cd644f 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -446,7 +446,7 @@ (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) (license (list license:bsd-3 license:bsd-2)))) ; libfdt -(define-public arm-trusted-firmware-pine64-plus +(define-public arm-trusted-firmware-sun50i-a64 (let ((base (make-arm-trusted-firmware "sun50i_a64")) ;; Use unreleased version which enables additional features needed for ;; LCD support @@ -454,7 +454,7 @@ (define-public arm-trusted-firmware-pine64-plus (revision "1")) (package (inherit base) - (name "arm-trusted-firmware-pine64-plus") + (name "arm-trusted-firmware-sun50i-a64") (version (git-version "2.0" revision commit)) (source (origin -- cgit v1.2.3