From 07ca90458f34e425416f37bc7fcd5b178ab6734a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 7 May 2018 14:32:02 +0000 Subject: system: Add mx6cuboxi installer. * gnu/bootloader/u-boot.scm (u-boot-mx6cuboxi-bootloader): New exported variable. * gnu/system/install.scm (mx6cuboxi-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/bootloader') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 21d0aecce..58ee528a2 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -33,6 +33,7 @@ u-boot-a20-olinuxino-micro-bootloader u-boot-banana-pi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader + u-boot-mx6cuboxi-bootloader u-boot-nintendo-nes-classic-edition-bootloader)) (define install-u-boot @@ -62,6 +63,15 @@ (write-file-on-device u-boot (stat:size (stat u-boot)) device (* 8 1024))))) +(define install-imx-u-boot + #~(lambda (bootloader device mount-point) + (let ((spl (string-append bootloader "/libexec/SPL")) + (u-boot (string-append bootloader "/libexec/u-boot.img"))) + (write-file-on-device spl (stat:size (stat spl)) + device (* 1 1024)) + (write-file-on-device u-boot (stat:size (stat u-boot)) + device (* 69 1024))))) + ;;; @@ -86,6 +96,11 @@ (inherit u-boot-bootloader) (installer install-allwinner-u-boot))) +(define u-boot-imx-bootloader + (bootloader + (inherit u-boot-bootloader) + (installer install-imx-u-boot))) + (define u-boot-nintendo-nes-classic-edition-bootloader (bootloader (inherit u-boot-allwinner-bootloader) @@ -110,3 +125,8 @@ (bootloader (inherit u-boot-allwinner-bootloader) (package u-boot-banana-pi-m2-ultra))) + +(define u-boot-mx6cuboxi-bootloader + (bootloader + (inherit u-boot-imx-bootloader) + (package u-boot-mx6cuboxi))) -- cgit v1.3 From fd5536e32b7896e46daf55a52805ea020e43b088 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 7 May 2018 14:34:43 +0000 Subject: system: Add wandboard installer. * gnu/bootloader/u-boot.scm (u-boot-wandboard-bootloader): New exported variable. * gnu/system/install.scm (wandboard-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 8 +++++++- gnu/system/install.scm | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/bootloader') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 58ee528a2..9a62a166f 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -34,7 +34,8 @@ u-boot-banana-pi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader u-boot-mx6cuboxi-bootloader - u-boot-nintendo-nes-classic-edition-bootloader)) + u-boot-nintendo-nes-classic-edition-bootloader + u-boot-wandboard-bootloader)) (define install-u-boot #~(lambda (bootloader device mount-point) @@ -130,3 +131,8 @@ (bootloader (inherit u-boot-imx-bootloader) (package u-boot-mx6cuboxi))) + +(define u-boot-wandboard-bootloader + (bootloader + (inherit u-boot-imx-bootloader) + (package u-boot-wandboard))) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 7580d981b..9bb1d8145 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -50,7 +50,8 @@ banana-pi-m2-ultra-installation-os beaglebone-black-installation-os mx6cuboxi-installation-os - nintendo-nes-classic-edition-installation-os)) + nintendo-nes-classic-edition-installation-os + wandboard-installation-os)) ;;; Commentary: ;;; @@ -440,6 +441,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card (solder it yourself) "ttyS0")) +(define wandboard-installation-os + (embedded-installation-os u-boot-wandboard-bootloader + "/dev/mmcblk0" ; SD card storage + "ttymxc0")) + ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.3 From 1b960787e21eb746df051592094478dd5ce8bcbb Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 9 May 2018 06:59:10 +0000 Subject: system: Add u-boot-novena installer. * gnu/packages/bootloaders.scm (u-boot-novena): New variable. * gnu/bootloader/u-boot.scm (u-boot-novena-bootloader): New exported variable. * gnu/system/install.scm (novena-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 6 ++++++ 3 files changed, 15 insertions(+) (limited to 'gnu/bootloader') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 9a62a166f..bc8f98f32 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -35,6 +35,7 @@ u-boot-beaglebone-black-bootloader u-boot-mx6cuboxi-bootloader u-boot-nintendo-nes-classic-edition-bootloader + u-boot-novena-bootloader u-boot-wandboard-bootloader)) (define install-u-boot @@ -136,3 +137,8 @@ (bootloader (inherit u-boot-imx-bootloader) (package u-boot-wandboard))) + +(define u-boot-novena-bootloader + (bootloader + (inherit u-boot-imx-bootloader) + (package u-boot-novena))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0db6ad3f6..c0a0101c5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -469,6 +469,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-mx6cuboxi (make-u-boot-package "mx6cuboxi" "arm-linux-gnueabihf")) +(define-public u-boot-novena + (make-u-boot-package "novena" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 9bb1d8145..a2917e485 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -51,6 +51,7 @@ beaglebone-black-installation-os mx6cuboxi-installation-os nintendo-nes-classic-edition-installation-os + novena-installation-os wandboard-installation-os)) ;;; Commentary: @@ -436,6 +437,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card storage "ttymxc0")) +(define novena-installation-os + (embedded-installation-os u-boot-novena-bootloader + "/dev/mmcblk1" ; SD card storage + "ttymxc1")) + (define nintendo-nes-classic-edition-installation-os (embedded-installation-os u-boot-nintendo-nes-classic-edition-bootloader "/dev/mmcblk0" ; SD card (solder it yourself) -- cgit v1.3 From afca98ff01e036594778ab687f472ef5d759f653 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 11 May 2018 15:02:01 -0700 Subject: bootloader: extlinux: Fix menu support with u-boot. * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Set MENU TITLE in generated extlinux.conf. Signed-off-by: Danny Milosavljevic --- gnu/bootloader/extlinux.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/bootloader') diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index f7820a37a..8b7a95a6f 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -64,6 +64,7 @@ corresponding to old generations of the system." (format port "# This file was generated from your GuixSD configuration. Any changes # will be lost upon reconfiguration. UI menu.c32 +MENU TITLE GuixSD Boot Options PROMPT ~a TIMEOUT ~a~%" (if (> timeout 0) 1 0) -- cgit v1.3