diff options
| author | Vagrant Cascadian <vagrant@debian.org> | 2020-07-05 17:30:29 -0700 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2020-07-05 17:55:12 -0700 |
| commit | f3a5e5881390be67965ebdd7fd7620e95d771f03 (patch) | |
| tree | 366496e0be9749b135a389ebd8a26043d8e8a47a /gnu/packages/firmware.scm | |
| parent | 6ee7468758d7c043692ae8c0b5e130fa4eabe94c (diff) | |
| download | guix-patches-f3a5e5881390be67965ebdd7fd7620e95d771f03.tar guix-patches-f3a5e5881390be67965ebdd7fd7620e95d771f03.tar.gz | |
gnu: opensbi: Update to 0.8.
* gnu/packages/firmware (make-opensbi-package): Add name argument.
Drop variant argument.
(opensbi-qemu-sifive-fu540): Adjust arguments.
(opensbi-qemu-generic): New variable.
(opensbi-qemu-virt): Change to deprecated variable.
Diffstat (limited to 'gnu/packages/firmware.scm')
| -rw-r--r-- | gnu/packages/firmware.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e0a162f1b8..91136ab174 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -189,12 +189,10 @@ Broadcom/AirForce chipset BCM43xx with Wireless-Core Revision 5. It is used by the b43-open driver of Linux-libre.") (license license:gpl2))) -(define* (make-opensbi-package platform variant #:optional (arch "riscv64")) +(define* (make-opensbi-package platform name #:optional (arch "riscv64")) (package - (name (string-replace-substring - (string-append "opensbi-" platform "-" variant) - "_" "-")) - (version "0.6") + (name name) + (version "0.8") (source (origin (method git-fetch) @@ -203,7 +201,7 @@ by the b43-open driver of Linux-libre.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "129ypdga0fzn657n2f42g2a1vx3hf8x7sd78h06d35pgkry0jkl7")))) + (base32 "1y9z0b6q6wpw7mgy31wml4djc6m8ydm71a9f1asnks4ragc7m98b")))) (build-system gnu-build-system) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) @@ -213,7 +211,7 @@ by the b43-open driver of Linux-libre.") '()))) (arguments `(#:tests? #f ; no check target - #:make-flags (list (string-append "PLATFORM=" ,platform "/" ,variant) + #:make-flags (list (string-append "PLATFORM=" ,platform) ,@(if (and (not (string-prefix? "riscv64" (%current-system))) (string-prefix? "riscv64" arch)) @@ -243,11 +241,14 @@ for platform-specific firmwares executing in M-mode.") ;; platform/ariane-fpga/* is gpl2. license:gpl2)))) +(define-public opensbi-qemu-generic + (make-opensbi-package "generic" "opensbi-qemu-generic")) + (define-public opensbi-qemu-virt - (make-opensbi-package "qemu" "virt")) + (deprecated-package "opensbi-qemu-virt" opensbi-qemu-generic)) (define-public opensbi-sifive-fu540 - (make-opensbi-package "sifive" "fu540")) + (make-opensbi-package "sifive/fu540" "opensbi-sifive-fu540")) (define-public opensbi-qemu-sifive-u ;; Dropped upstream, as all functionality is present in the sifive-fu540 |