Subject: bug#31486: closed (Re: [bug#31486] [PATCH 1/1] system: Add u-boot-pine64-plus installer.)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 18 May 2018 18:24:02 +0000

Your bug report

#31486: [PATCH 1/1] system: Add u-boot-pine64-plus installer.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
31486: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=31486
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#31486] [PATCH 1/1] system: Add u-boot-pine64-plus installer.
From: Danny Milosavljevic <[email-masked]>
To: Vagrant Cascadian <[email-masked]>
Cc: [email-masked]
Date: Fri, 18 May 2018 20:22:49 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Applied to guix master as 9f7d66656646fac3746c52216ad6061c9c0adc27.  Thanks!

Subject: [PATCH 1/1] system: Add u-boot-pine64-plus installer.
From: Vagrant Cascadian <[email-masked]>
To: [email-masked]
Date: Thu, 17 May 2018 15:16:09 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

system: Add u-boot-pine64-plus installer.

* gnu/bootloader/u-boot.scm (u-boot-pine64-plus-bootloader):
  New exported variable.
* gnu/system/install.scm (pine64-plus-installation-os):
  New exported variable.
---
 gnu/bootloader/u-boot.scm | 20 ++++++++++++++++++++
 gnu/system/install.scm    |  6 ++++++
 2 files changed, 26 insertions(+)

diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index bc8f98f32..ea0f67b3c 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -36,6 +36,7 @@
             u-boot-mx6cuboxi-bootloader
             u-boot-nintendo-nes-classic-edition-bootloader
             u-boot-novena-bootloader
+            u-boot-pine64-plus-bootloader
             u-boot-wandboard-bootloader))
 
 (define install-u-boot
@@ -65,6 +66,15 @@
         (write-file-on-device u-boot (stat:size (stat u-boot))
                               device (* 8 1024)))))
 
+(define install-allwinner64-u-boot
+  #~(lambda (bootloader device mount-point)
+      (let ((spl (string-append bootloader "/libexec/spl/sunxi-spl.bin"))
+            (u-boot (string-append bootloader "/libexec/u-boot.itb")))
+        (write-file-on-device spl (stat:size (stat spl))
+                              device (* 8 1024))
+        (write-file-on-device u-boot (stat:size (stat u-boot))
+                              device (* 40 1024)))))
+
 (define install-imx-u-boot
   #~(lambda (bootloader device mount-point)
       (let ((spl (string-append bootloader "/libexec/SPL"))
@@ -98,6 +108,11 @@
    (inherit u-boot-bootloader)
    (installer install-allwinner-u-boot)))
 
+(define u-boot-allwinner64-bootloader
+  (bootloader
+   (inherit u-boot-bootloader)
+   (installer install-allwinner64-u-boot)))
+
 (define u-boot-imx-bootloader
   (bootloader
    (inherit u-boot-bootloader)
@@ -142,3 +157,8 @@
   (bootloader
    (inherit u-boot-imx-bootloader)
    (package u-boot-novena)))
+
+(define u-boot-pine64-plus-bootloader
+  (bootloader
+   (inherit u-boot-allwinner64-bootloader)
+   (package u-boot-pine64-plus)))
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index a2917e485..3efff915a 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -52,6 +52,7 @@
             mx6cuboxi-installation-os
             nintendo-nes-classic-edition-installation-os
             novena-installation-os
+            pine64-plus-installation-os
             wandboard-installation-os))
 
 ;;; Commentary:
@@ -447,6 +448,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
                             "/dev/mmcblk0" ; SD card (solder it yourself)
                             "ttyS0"))
 
+(define pine64-plus-installation-os
+  (embedded-installation-os u-boot-pine64-plus-bootloader
+                            "/dev/mmcblk0" ; SD card storage
+                            "ttyS0"))
+
 (define wandboard-installation-os
   (embedded-installation-os u-boot-wandboard-bootloader
                             "/dev/mmcblk0" ; SD card storage
-- 
2.11.0