From 30aeb846d7516d534aebeee76be4a920195e8d50 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 19 Jan 2018 00:25:13 +0100 Subject: system: Add Banana Pi M2 Ultra installer. * gnu/bootloader/u-boot.scm (u-boot-banana-pi-m2-ultra-bootloader): New exported variable. (install-allwinner-u-boot): New variable. (u-boot-allwinner-bootloader): New variable. * gnu/packages/bootloaders.scm (u-boot-banana-pi-m2-ultra): New exported variable. * gnu/system/install.scm (banana-pi-m2-ultra-installation-os): New exported variable. --- gnu/system/install.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 1cc3db1160..c7bfdb2595 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -44,6 +44,7 @@ (define-module (gnu system install) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os + banana-pi-m2-ultra-installation-os beaglebone-black-installation-os)) ;;; Commentary: @@ -399,6 +400,22 @@ (define beaglebone-black-installation-os (tty "ttyO0")))) (operating-system-user-services installation-os))))) +(define banana-pi-m2-ultra-installation-os + (operating-system + (inherit installation-os) + (bootloader (bootloader-configuration + (bootloader u-boot-banana-pi-m2-ultra-bootloader) + (target "/dev/mmcblk1"))) ; eMMC storage + (kernel linux-libre) + (services (append + (list (agetty-service + (agetty-configuration + (extra-options '("-L")) + (baud-rate "115200") + (term "vt100") + (tty "ttyS0")))) + (operating-system-user-services installation-os))))) + ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.2.3 From 4b9e9abb36db3c658cd915bcc580dc3da8938863 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 20:46:00 +0100 Subject: system: Add A20 OLinuXino LIME2 installer. * gnu/bootloader/u-boot.scm (u-boot-a20-olinuxino-lime2-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-a20-olinuxino-lime2): New exported variable. * gnu/system/install.scm (a20-olinuxino-lime2-emmc-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 1e3178adfc..d45835c271 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -28,6 +28,7 @@ (define-module (gnu bootloader u-boot) #:use-module (guix records) #:use-module (guix utils) #:export (u-boot-bootloader + u-boot-a20-olinuxino-lime2-bootloader u-boot-banana-pi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader)) @@ -82,6 +83,11 @@ (define u-boot-allwinner-bootloader (inherit u-boot-bootloader) (installer install-allwinner-u-boot))) +(define u-boot-a20-olinuxino-lime2-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-a20-olinuxino-lime2))) + (define u-boot-banana-pi-m2-ultra-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 4d1f784648..b0fa2b54af 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -428,6 +428,9 @@ (define-public u-boot-odroid-c2 (define-public u-boot-banana-pi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) +(define-public u-boot-a20-olinuxino-lime2 + (make-u-boot-package "A20-OLinuXino-Lime2" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index c7bfdb2595..22b297c736 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -44,6 +44,7 @@ (define-module (gnu system install) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os + a20-olinuxino-lime2-emmc-installation-os banana-pi-m2-ultra-installation-os beaglebone-black-installation-os)) @@ -400,6 +401,22 @@ (define beaglebone-black-installation-os (tty "ttyO0")))) (operating-system-user-services installation-os))))) +(define a20-olinuxino-lime2-emmc-installation-os + (operating-system + (inherit installation-os) + (bootloader (bootloader-configuration + (bootloader u-boot-a20-olinuxino-lime2-bootloader) + (target "/dev/mmcblk1"))) ; eMMC storage + (kernel linux-libre) + (services (append + (list (agetty-service + (agetty-configuration + (extra-options '("-L")) + (baud-rate "115200") + (term "vt100") + (tty "ttyS0")))) + (operating-system-user-services installation-os))))) + (define banana-pi-m2-ultra-installation-os (operating-system (inherit installation-os) -- cgit v1.2.3 From a7bb327e3c457cd99710c92b5d09f76b7ab45000 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 20:55:52 +0100 Subject: system: Add A20 OLinuXino MICRO installer. * gnu/bootloader/u-boot.scm (u-boot-a20-olinuxino-micro-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-a20-olinuxino-micro): New exported variable. * gnu/system/install.scm (a20-olinuxino-micro-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index d45835c271..535573791b 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -29,6 +29,7 @@ (define-module (gnu bootloader u-boot) #:use-module (guix utils) #:export (u-boot-bootloader u-boot-a20-olinuxino-lime2-bootloader + u-boot-a20-olinuxino-micro-bootloader u-boot-banana-pi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader)) @@ -88,6 +89,11 @@ (define u-boot-a20-olinuxino-lime2-bootloader (inherit u-boot-allwinner-bootloader) (package u-boot-a20-olinuxino-lime2))) +(define u-boot-a20-olinuxino-micro-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-a20-olinuxino-micro))) + (define u-boot-banana-pi-m2-ultra-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b0fa2b54af..7a5a1d88ee 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -431,6 +431,9 @@ (define-public u-boot-banana-pi-m2-ultra (define-public u-boot-a20-olinuxino-lime2 (make-u-boot-package "A20-OLinuXino-Lime2" "arm-linux-gnueabihf")) +(define-public u-boot-a20-olinuxino-micro + (make-u-boot-package "A20-OLinuXino_MICRO" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 22b297c736..56b6a99da7 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -45,6 +45,7 @@ (define-module (gnu system install) #:use-module (srfi srfi-26) #:export (installation-os a20-olinuxino-lime2-emmc-installation-os + a20-olinuxino-micro-installation-os banana-pi-m2-ultra-installation-os beaglebone-black-installation-os)) @@ -417,6 +418,22 @@ (define a20-olinuxino-lime2-emmc-installation-os (tty "ttyS0")))) (operating-system-user-services installation-os))))) +(define a20-olinuxino-micro-installation-os + (operating-system + (inherit installation-os) + (bootloader (bootloader-configuration + (bootloader u-boot-a20-olinuxino-lime2-bootloader) + (target "/dev/mmcblk0"))) ; SD card storage + (kernel linux-libre) + (services (append + (list (agetty-service + (agetty-configuration + (extra-options '("-L")) + (baud-rate "115200") + (term "vt100") + (tty "ttyS0")))) + (operating-system-user-services installation-os))))) + (define banana-pi-m2-ultra-installation-os (operating-system (inherit installation-os) -- cgit v1.2.3 From 8bac66deabb8858bfa9ac29eaf31d68ae86fd0df Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 21:01:58 +0100 Subject: system: Factor out agetty-default-service. * gnu/system/install.scm (agetty-default-service): New variable. (beaglebone-black-installation-os): Use it. (a20-olinuxino-lime2-emmc-installation-os): Use it. (a20-olinuxino-micro-installation-os): Use it. (banana-pi-m2-ultra-installation-os): Use it. --- gnu/system/install.scm | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 56b6a99da7..714e8cac3f 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -379,6 +379,14 @@ (define installation-os nvi ;:wq! %base-packages)))) +(define* (agetty-default-service #:optional (tty "ttyS0")) + "Return an agetty-service on the given TTY" + (agetty-service (agetty-configuration + (extra-options '("-L")) + (baud-rate "115200") + (term "vt100") + (tty tty)))) + (define beaglebone-black-installation-os (operating-system (inherit installation-os) @@ -391,16 +399,8 @@ (define beaglebone-black-installation-os ;; This module is required to mount the sd card. #:extra-modules (list "omap_hsmmc") rest))) - (services (append - ;; mingetty does not work on serial lines. - ;; Use agetty with board-specific serial parameters. - (list (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyO0")))) - (operating-system-user-services installation-os))))) + (services (cons* (agetty-default-service "ttyO0") + (operating-system-user-services installation-os))))) (define a20-olinuxino-lime2-emmc-installation-os (operating-system @@ -409,14 +409,8 @@ (define a20-olinuxino-lime2-emmc-installation-os (bootloader u-boot-a20-olinuxino-lime2-bootloader) (target "/dev/mmcblk1"))) ; eMMC storage (kernel linux-libre) - (services (append - (list (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyS0")))) - (operating-system-user-services installation-os))))) + (services (cons* (agetty-default-service "ttyS0") + (operating-system-user-services installation-os))))) (define a20-olinuxino-micro-installation-os (operating-system @@ -425,14 +419,8 @@ (define a20-olinuxino-micro-installation-os (bootloader u-boot-a20-olinuxino-lime2-bootloader) (target "/dev/mmcblk0"))) ; SD card storage (kernel linux-libre) - (services (append - (list (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyS0")))) - (operating-system-user-services installation-os))))) + (services (cons* (agetty-default-service "ttyS0") + (operating-system-user-services installation-os))))) (define banana-pi-m2-ultra-installation-os (operating-system @@ -441,14 +429,8 @@ (define banana-pi-m2-ultra-installation-os (bootloader u-boot-banana-pi-m2-ultra-bootloader) (target "/dev/mmcblk1"))) ; eMMC storage (kernel linux-libre) - (services (append - (list (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyS0")))) - (operating-system-user-services installation-os))))) + (services (cons* (agetty-default-service "ttyS0") + (operating-system-user-services installation-os))))) ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.2.3 From fccdc8c839370558da8f05626b781bb678d86c94 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 21:11:34 +0100 Subject: system: Factor out embedded-installation-os. * gnu/system/install.scm (embedded-installation-os): New variable. (beaglebone-black-installation-os): Use it. (a20-olinuxino-lime2-emmc-installation-os): Use it. (a20-olinuxino-micro-installation-os): Use it. (banana-pi-m2-ultra-installation-os): Use it. --- gnu/system/install.scm | 58 ++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 714e8cac3f..e84e6a6bc1 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -387,50 +387,48 @@ (define* (agetty-default-service #:optional (tty "ttyS0")) (term "vt100") (tty tty)))) -(define beaglebone-black-installation-os +(define* (embedded-installation-os bootloader bootloader-target tty + #:key (extra-modules '())) + "Return an installation os for embedded systems. +The initrd gets the extra modules EXTRA-MODULES. +A getty is provided on TTY. +The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." (operating-system (inherit installation-os) (bootloader (bootloader-configuration - (bootloader u-boot-beaglebone-black-bootloader) - (target "/dev/sda"))) + (bootloader bootloader) + (target bootloader-target))) (kernel linux-libre) (initrd (lambda (fs . rest) (apply base-initrd fs - ;; This module is required to mount the sd card. - #:extra-modules (list "omap_hsmmc") + #:extra-modules extra-modules rest))) - (services (cons* (agetty-default-service "ttyO0") + (services (cons* (agetty-default-service tty) (operating-system-user-services installation-os))))) +(define beaglebone-black-installation-os + (embedded-installation-os u-boot-beaglebone-black-bootloader + "/dev/sda" + "ttyO0" + #:extra-modules + ;; This module is required to mount the sd card. + '("omap_hsmmc"))) + + (define a20-olinuxino-lime2-emmc-installation-os - (operating-system - (inherit installation-os) - (bootloader (bootloader-configuration - (bootloader u-boot-a20-olinuxino-lime2-bootloader) - (target "/dev/mmcblk1"))) ; eMMC storage - (kernel linux-libre) - (services (cons* (agetty-default-service "ttyS0") - (operating-system-user-services installation-os))))) + (embedded-installation-os u-boot-a20-olinuxino-lime2-bootloader + "/dev/mmcblk1" ; eMMC storage + "ttyS0")) (define a20-olinuxino-micro-installation-os - (operating-system - (inherit installation-os) - (bootloader (bootloader-configuration - (bootloader u-boot-a20-olinuxino-lime2-bootloader) - (target "/dev/mmcblk0"))) ; SD card storage - (kernel linux-libre) - (services (cons* (agetty-default-service "ttyS0") - (operating-system-user-services installation-os))))) + (embedded-installation-os u-boot-a20-olinuxino-micro-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) (define banana-pi-m2-ultra-installation-os - (operating-system - (inherit installation-os) - (bootloader (bootloader-configuration - (bootloader u-boot-banana-pi-m2-ultra-bootloader) - (target "/dev/mmcblk1"))) ; eMMC storage - (kernel linux-libre) - (services (cons* (agetty-default-service "ttyS0") - (operating-system-user-services installation-os))))) + (embedded-installation-os u-boot-banana-pi-m2-ultra-bootloader + "/dev/mmcblk1" ; eMMC storage + "ttyS0")) ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.2.3 From 84ee33787e011fbf7d04eed1bc2d0765cef57b52 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 22:05:16 +0100 Subject: system: Add Nintendo NES Classic Edition installer. * gnu/bootloader/u-boot.scm (u-boot-nintendo-nes-classic-edition-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-nintendo-nes-classic-edition): New exported variable. * gnu/system/install.scm (nintendo-nes-classic-edition-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 8 +++++++- gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 535573791b..d80ffdb963 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -31,7 +31,8 @@ (define-module (gnu bootloader u-boot) u-boot-a20-olinuxino-lime2-bootloader u-boot-a20-olinuxino-micro-bootloader u-boot-banana-pi-m2-ultra-bootloader - u-boot-beaglebone-black-bootloader)) + u-boot-beaglebone-black-bootloader + u-boot-nintendo-nes-classic-edition-bootloader)) (define install-u-boot #~(lambda (bootloader device mount-point) @@ -84,6 +85,11 @@ (define u-boot-allwinner-bootloader (inherit u-boot-bootloader) (installer install-allwinner-u-boot))) +(define u-boot-nintendo-nes-classic-edition-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-nintendo-nes-classic-edition))) + (define u-boot-a20-olinuxino-lime2-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e6fc9b602d..d16db455f0 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -436,6 +436,9 @@ (define-public u-boot-a20-olinuxino-lime2 (define-public u-boot-a20-olinuxino-micro (make-u-boot-package "A20-OLinuXino_MICRO" "arm-linux-gnueabihf")) +(define-public u-boot-nintendo-nes-classic-edition + (make-u-boot-package "Nintendo_NES_Classic_Edition" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index e84e6a6bc1..fe330621ca 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -47,7 +47,8 @@ (define-module (gnu system install) a20-olinuxino-lime2-emmc-installation-os a20-olinuxino-micro-installation-os banana-pi-m2-ultra-installation-os - beaglebone-black-installation-os)) + beaglebone-black-installation-os + nintendo-nes-classic-edition-installation-os)) ;;; Commentary: ;;; @@ -430,6 +431,11 @@ (define banana-pi-m2-ultra-installation-os "/dev/mmcblk1" ; eMMC storage "ttyS0")) +(define nintendo-nes-classic-edition-installation-os + (embedded-installation-os u-boot-nintendo-nes-classic-edition-bootloader + "/dev/mmcblk0" ; SD card (solder it yourself) + "ttyS0")) + ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.2.3 From 30875d07ef7c970c77ee6117043ad59c16a4e777 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Jan 2018 00:18:34 +0100 Subject: doc: No longer mention Wicd in OS examples. * gnu/system/examples/desktop.tmpl, gnu/system/examples/lightweight-desktop.tmpl: Mention NetworkManager instead of Wicd. --- gnu/system/examples/desktop.tmpl | 4 ++-- gnu/system/examples/lightweight-desktop.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 2131d1f18f..e8740407d0 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -48,8 +48,8 @@ ;; Add GNOME and/or Xfce---we can choose at the log-in ;; screen with F1. Use the "desktop" services, which - ;; include the X11 log-in service, networking with Wicd, - ;; and more. + ;; include the X11 log-in service, networking with + ;; NetworkManager, and more. (services (cons* (gnome-desktop-service) (xfce-desktop-service) %desktop-services)) diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index d13c04c76c..65a8ee1809 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -47,7 +47,7 @@ %base-packages)) ;; Use the "desktop" services, which include the X11 - ;; log-in service, networking with Wicd, and more. + ;; log-in service, networking with NetworkManager, and more. (services %desktop-services) ;; Allow resolution of '.local' host names with mDNS. -- cgit v1.2.3 From c55c6985948b12a39cd5805bde95db9a80def3ba Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 22 Jan 2018 22:35:06 +0100 Subject: system: Add A20 OLinuXino LIME installer. * gnu/bootloader/u-boot.scm (u-boot-a20-olinuxino-lime-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-a20-olinuxino-lime): New exported variable. * gnu/system/install.scm (a20-olinuxino-lime-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/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index d80ffdb963..21d0aecce2 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -28,6 +28,7 @@ (define-module (gnu bootloader u-boot) #:use-module (guix records) #:use-module (guix utils) #:export (u-boot-bootloader + u-boot-a20-olinuxino-lime-bootloader u-boot-a20-olinuxino-lime2-bootloader u-boot-a20-olinuxino-micro-bootloader u-boot-banana-pi-m2-ultra-bootloader @@ -90,6 +91,11 @@ (define u-boot-nintendo-nes-classic-edition-bootloader (inherit u-boot-allwinner-bootloader) (package u-boot-nintendo-nes-classic-edition))) +(define u-boot-a20-olinuxino-lime-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-a20-olinuxino-lime))) + (define u-boot-a20-olinuxino-lime2-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d16db455f0..f7aa21fa61 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -430,6 +430,9 @@ (define-public u-boot-odroid-c2 (define-public u-boot-banana-pi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) +(define-public u-boot-a20-olinuxino-lime + (make-u-boot-package "A20-OLinuXino-Lime" "arm-linux-gnueabihf")) + (define-public u-boot-a20-olinuxino-lime2 (make-u-boot-package "A20-OLinuXino-Lime2" "arm-linux-gnueabihf")) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index fe330621ca..2864150521 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -44,6 +44,7 @@ (define-module (gnu system install) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os + a20-olinuxino-lime-installation-os a20-olinuxino-lime2-emmc-installation-os a20-olinuxino-micro-installation-os banana-pi-m2-ultra-installation-os @@ -416,6 +417,11 @@ (define beaglebone-black-installation-os '("omap_hsmmc"))) +(define a20-olinuxino-lime-sd-installation-os + (embedded-installation-os u-boot-a20-olinuxino-lime-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) + (define a20-olinuxino-lime2-emmc-installation-os (embedded-installation-os u-boot-a20-olinuxino-lime2-bootloader "/dev/mmcblk1" ; eMMC storage -- cgit v1.2.3 From 0db22b32ce5efa34c8f4f12649a248bce2fff250 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 23 Jan 2018 12:00:14 +0100 Subject: system: Rename a20-olinuxino-lime-sd-installation-os. * gnu/system/install.scm (a20-olinuxino-lime-sd-installation-os): Rename to... (a20-olinuxino-lime-installation-os): ...this. --- gnu/system/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 2864150521..e4b2e82378 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -417,7 +417,7 @@ (define beaglebone-black-installation-os '("omap_hsmmc"))) -(define a20-olinuxino-lime-sd-installation-os +(define a20-olinuxino-lime-installation-os (embedded-installation-os u-boot-a20-olinuxino-lime-bootloader "/dev/mmcblk0" ; SD card storage "ttyS0")) -- cgit v1.2.3