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/packages/bootloaders.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0db6ad3f6a..c0a0101c55 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") -- cgit v1.2.3 From 3bdb24826ebb568580c93580e4b4a9567f8060cc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 11 May 2018 16:37:52 -0700 Subject: gnu: u-boot: Update to 2018.05. * gnu/packages/bootloaders.scm (u-boot): Update to 2018.05. Signed-off-by: Danny Milosavljevic --- gnu/packages/bootloaders.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c0a0101c55..b72858f7be 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -338,7 +338,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2018.01") + (version "2018.05") (source (origin (method url-fetch) (uri (string-append @@ -346,7 +346,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1nidnnjprgxdhiiz7gmaj8cgcf52l5gbv64cmzjq4gmkjirmk3wk")))) + "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad")))) (native-inputs `(("bc" ,bc) ;("dtc" ,dtc) ; they have their own incompatible copy. -- cgit v1.2.3 From 53e290df57d284b5d3d4f40d5f0260283ac4cbee Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 12 May 2018 09:43:23 +0200 Subject: gnu: u-boot: Add our dtc. * gnu/packages/bootloaders.scm (u-boot)[native-inputs]: Add dtc. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b72858f7be..3de70e2c66 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -349,7 +349,7 @@ tree binary files. These are board description files used by Linux and BSD.") "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad")))) (native-inputs `(("bc" ,bc) - ;("dtc" ,dtc) ; they have their own incompatible copy. + ("dtc" ,dtc) ("python-2" ,python-2) ("swig" ,swig))) (build-system gnu-build-system) -- cgit v1.2.3 From 30ef146c996983cdcca7c0d17b2dee2fe31806d4 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 12 May 2018 10:54:19 +0200 Subject: gnu: make-u-boot-package: Sort printed configurations. * gnu/packages/bootloaders.scm (make-u-boot-package): Sort printed configurations. --- gnu/packages/bootloaders.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 3de70e2c66..22b88dd1b9 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -393,14 +393,15 @@ also initializes the boards (RAM etc).") (zero? (apply system* "make" `(,@make-flags ,config-name))) (begin (display "Invalid board name. Valid board names are:") - (let ((suffix-len (string-length "_defconfig"))) - (scandir "configs" - (lambda (file-name) - (when (string-suffix? "_defconfig" file-name) - (format #t - "- ~A\n" - (string-drop-right file-name - suffix-len)))))) + (let ((suffix-len (string-length "_defconfig")) + (entries (scandir "configs"))) + (for-each (lambda (file-name) + (when (string-suffix? "_defconfig" file-name) + (format #t + "- ~A\n" + (string-drop-right file-name + suffix-len)))) + (sort entries string<))) #f))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From ac30d18c0ba668a91547c97b3637dfd9caabbd37 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 12 May 2018 10:56:25 +0200 Subject: gnu: make-u-boot-package: Print errors to (current-error-port). * gnu/packages/bootloaders.scm (make-u-boot-package): Print errors to (current-error-port). --- gnu/packages/bootloaders.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 22b88dd1b9..ff9078b9f7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -392,12 +392,13 @@ also initializes the boards (RAM etc).") (if (file-exists? (string-append "configs/" config-name)) (zero? (apply system* "make" `(,@make-flags ,config-name))) (begin - (display "Invalid board name. Valid board names are:") + (display "Invalid board name. Valid board names are:" + (current-error-port)) (let ((suffix-len (string-length "_defconfig")) (entries (scandir "configs"))) (for-each (lambda (file-name) (when (string-suffix? "_defconfig" file-name) - (format #t + (format (current-error-port) "- ~A\n" (string-drop-right file-name suffix-len)))) @@ -473,6 +474,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-novena (make-u-boot-package "novena" "arm-linux-gnueabihf")) +(define-public u-boot-versatilepb + (make-u-boot-package "vesx" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") -- cgit v1.2.3 From 35e427d154b6bdcd1a6f68445efab9b384300ec9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 12 May 2018 11:09:42 +0200 Subject: gnu: u-boot-pine64-plus: Use bundled dtc. * gnu/packages/bootloaders.scm (u-boot-pine64-plus)[arguments]<#:phases> [set-environment]: Use bundled dtc. --- gnu/packages/bootloaders.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ff9078b9f7..7aea959e83 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -442,9 +442,10 @@ also initializes the boards (RAM etc).") (let ((bl31 (string-append (assoc-ref inputs "firmware") "/bl31.bin"))) (setenv "BL31" bl31) - ;; This is necessary while we're using the bundled dtc. - (setenv "PATH" (string-append (getenv "PATH") ":" - "scripts/dtc"))) + ;; This is necessary when we're using the bundled dtc. + ;(setenv "PATH" (string-append (getenv "PATH") ":" + ; "scripts/dtc")) + ) #t)))))) (native-inputs `(("firmware" ,arm-trusted-firmware-pine64-plus) -- cgit v1.2.3 From 78ad8db682516cb7a38f14bae069f45eb2942784 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 12 May 2018 11:11:25 +0200 Subject: gnu: u-boot-versatilepb: Remove package. * gnu/packages/bootloaders.scm (u-boot-versatilepb): Delete variable. --- gnu/packages/bootloaders.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7aea959e83..87fb2cf855 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -475,9 +475,6 @@ also initializes the boards (RAM etc).") (define-public u-boot-novena (make-u-boot-package "novena" "arm-linux-gnueabihf")) -(define-public u-boot-versatilepb - (make-u-boot-package "vesx" "arm-linux-gnueabihf")) - (define-public vboot-utils (package (name "vboot-utils") -- cgit v1.2.3 From dd4fe0c288b837802cd84fae880587bb9d2f8f27 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 12 May 2018 11:24:53 +0200 Subject: gnu: Add u-boot-cubieboard. * gnu/packages/bootloaders.scm (u-boot-cubieboard): New variable. --- gnu/packages/bootloaders.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 87fb2cf855..6cc90d1614 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -475,6 +475,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-novena (make-u-boot-package "novena" "arm-linux-gnueabihf")) +(define-public u-boot-cubieboard + (make-u-boot-package "Cubieboard" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") -- cgit v1.2.3 From 0fcfed3950c313d167ef281d6183a6d727311e14 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 12 May 2018 22:19:14 +0200 Subject: gnu: make-u-boot-package: Install "u-boot". * gnu/packages/bootloaders.scm (make-u-boot-package): Install "u-boot". --- gnu/packages/bootloaders.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 6cc90d1614..af5d97288d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -413,6 +413,8 @@ also initializes the boards (RAM etc).") (find-files "." "^(MLO|SPL)$")))) (mkdir-p libexec) (install-file ".config" libexec) + ;; Useful for "qemu -kernel". + (install-file "u-boot" libexec) (for-each (lambda (file) (let ((target-file (string-append libexec "/" file))) -- cgit v1.2.3