diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/bootloader | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.zip | |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/u-boot.scm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 6f41d0abe9..1da9d04eb2 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 David Craven <david@craven.ch> ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,7 @@ u-boot-pine64-plus-bootloader u-boot-pine64-lts-bootloader u-boot-pinebook-bootloader + u-boot-pinebook-pro-rk3399-bootloader u-boot-puma-rk3399-bootloader u-boot-rock64-rk3328-bootloader u-boot-rockpro64-rk3399-bootloader @@ -123,6 +125,8 @@ (write-file-on-device u-boot (stat:size (stat u-boot)) device (* 16384 512))))) +(define install-pinebook-pro-rk3399-u-boot install-rockpro64-rk3399-u-boot) + ;;; @@ -243,3 +247,10 @@ (inherit u-boot-bootloader) (package u-boot-rockpro64-rk3399) (installer install-rockpro64-rk3399-u-boot))) + +(define u-boot-pinebook-pro-rk3399-bootloader + ;; SD and eMMC use the same format + (bootloader + (inherit u-boot-bootloader) + (package u-boot-pinebook-pro-rk3399) + (installer install-pinebook-pro-rk3399-u-boot))) |