diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:17:08 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:52:11 +0100 |
| commit | 5fec94f3a3d4c67b748f11847064ed60d67c5ade (patch) | |
| tree | 9f2c7a21ad8f2c061a8d46aac817e4c68d307086 /gnu/bootloader | |
| parent | 6931ca9baaaee4c7e85cf3cd5d0f7e4eb5cfd88e (diff) | |
| parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
Merge remote-tracking branch 'savannah/master' into core-updates
Change-Id: I4f15bcb3e575062c4dd3b6c07a48470300413f24
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/u-boot.scm | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index d20aabd538..8e7cc05191 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2023 Herman Rimm <herman_rimm@protonmail.com> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ u-boot-rock64-rk3328-bootloader u-boot-rockpro64-rk3399-bootloader u-boot-sifive-unmatched-bootloader + u-boot-qemu-riscv64-bootloader u-boot-ts7970-q-2g-1000mhz-c-bootloader u-boot-wandboard-bootloader)) @@ -157,6 +159,12 @@ (write-file-on-device u-boot (stat:size (stat u-boot)) image (* 2082 512))))) +(define install-qemu-riscv64-u-boot + #~(lambda (bootloader device mount-point) + (let ((u-boot.bin (string-append bootloader "/libexec/u-boot.bin")) + (install-dir (string-append mount-point "/boot"))) + (install-file u-boot.bin install-dir)))) + ;;; @@ -307,3 +315,10 @@ (inherit u-boot-bootloader) (package u-boot-sifive-unmatched) (disk-image-installer install-sifive-unmatched-u-boot))) + +(define u-boot-qemu-riscv64-bootloader + (bootloader + (inherit u-boot-bootloader) + (package u-boot-qemu-riscv64) + (installer install-qemu-riscv64-u-boot) + (disk-image-installer #f))) |