diff options
| author | Marius Bakke <[email protected]> | 2019-12-18 23:07:40 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2019-12-18 23:07:40 +0100 |
| commit | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (patch) | |
| tree | 3a95b7f107763f959c31187d394d3fabbf1501c5 /gnu/packages/bootloaders.scm | |
| parent | 94c7f70faa0ba0409099b423df6534718d7518cc (diff) | |
| parent | 6afea7489b76c8db58d4f389fdbedc7c2b8992bd (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 156e4c4cdd..21b32a1ab1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner <[email protected]> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2019 nee <[email protected]> +;;; Copyright © 2019 Mathieu Othacehe <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +29,7 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages) #:use-module (gnu packages admin) - #:use-module ((gnu packages algebra) #:select (bc)) + #:use-module (gnu packages algebra) #:use-module (gnu packages assembly) #:use-module (gnu packages base) #:use-module (gnu packages disk) @@ -661,9 +662,11 @@ it fits within common partitioning schemes.") ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (string-append (assoc-ref inputs "firmware") - "/bl31.bin"))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((bl31 + (string-append + (assoc-ref (or native-inputs inputs) "firmware") + "/bl31.bin"))) (setenv "BL31" bl31) ;; This is necessary when we're using the bundled dtc. ;(setenv "PATH" (string-append (getenv "PATH") ":" @@ -677,6 +680,9 @@ it fits within common partitioning schemes.") (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) +(define-public u-boot-pine64-lts + (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu")) + (define-public u-boot-pinebook (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu")) |