From e7f392448d5e332a09cf5e77faedc1a3cb3e570d Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 6 Dec 2022 17:06:07 +0800 Subject: [PATCH] bootloader: install-rpi4-arm64-bootloader: Don't depend on Nonguix. * rosenthal/bootloader/u-boot.scm (install-rpi4-arm64-bootloader): Don't depend on Nonguix. --- rosenthal/bootloader/u-boot.scm | 35 ++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/rosenthal/bootloader/u-boot.scm b/rosenthal/bootloader/u-boot.scm index 0dbbb54..d321ade 100644 --- a/rosenthal/bootloader/u-boot.scm +++ b/rosenthal/bootloader/u-boot.scm @@ -23,27 +23,22 @@ kernel=u-boot.bin #~(lambda (bootloader device mount-point) (let ((u-boot (string-append bootloader "/libexec/u-boot.bin")) (install-dir (string-append mount-point "/boot"))) - ;; Autoload Nonguix*, so we only have a soft dependency. - ;; * - (module-autoload! (current-module) - '(nongnu packages linux) '(raspberrypi-firmware)) - ;; Install raspberrypi-firmware - (for-each (lambda (file) - (install-file - (string-append raspberrypi-firmware "/" file) install-dir)) - '(;; VideoCore firmwares - "start4.elf" ;basic - "start4x.elf" ;camera drivers and codec - "start4cd.elf" ;cut-down - "start4db.elf" ;debug - ;; Linker files - "fixup4.dat" - "fixup4x.dat" - "fixup4cd.dat" - "fixup4db.dat" - ;; Device Tree Overlays (for Raspberry Pi's bootloader) - "bcm2711-rpi-4-b.dtb")) + ;; (for-each (lambda (file) + ;; (install-file + ;; (string-append #$raspberrypi-firmware "/" file) install-dir)) + ;; '(;; VideoCore firmwares + ;; "start4.elf" ;basic + ;; "start4x.elf" ;camera drivers and codec + ;; "start4cd.elf" ;cut-down + ;; "start4db.elf" ;debug + ;; ;; Linker files + ;; "fixup4.dat" + ;; "fixup4x.dat" + ;; "fixup4cd.dat" + ;; "fixup4db.dat" + ;; ;; Device Tree Overlays (for Raspberry Pi's bootloader) + ;; "bcm2711-rpi-4-b.dtb")) ;; Install u-boot (install-file u-boot install-dir) ;; Raspberry Pi's bootloader configuration