From 7e954f674b9d7ec74aef405f3443f23443fc43ab Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 1 Feb 2020 01:21:12 +0000 Subject: gnu: u-boot-qemu-riscv64-smode: Add package. * gnu/packages/bootloaders (u-boot-qemu-riscv64-smode): 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 c072ff8c8e..5b2db2cf9f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -751,6 +751,9 @@ to Novena upstream, does not load u-boot.img from the first partition.") ("firmware-m0" ,rk3399-cortex-m0) ,@(package-native-inputs base)))))) +(define-public u-boot-qemu-riscv64-smode + (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu")) + (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) (package -- cgit v1.2.3 From 7d06364563bb800d8242be54011716c1b627ee91 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 1 Feb 2020 04:18:12 +0000 Subject: gnu: Add u-boot-sifive-fu540. * gnu/packages/bootloaders (u-boot-sifive-fu540): 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 5b2db2cf9f..2d39d51e1f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -754,6 +754,9 @@ to Novena upstream, does not load u-boot.img from the first partition.") (define-public u-boot-qemu-riscv64-smode (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu")) +(define-public u-boot-sifive-fu540 + (make-u-boot-package "sifive_fu540" "riscv64-linux-gnu")) + (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) (package -- cgit v1.2.3 From 10f31af9e36061e1fb7df8c394eecc1c1136b4bc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 1 Feb 2020 04:19:11 +0000 Subject: gnu: Add u-boot-qemu-riscv64. * gnu/packages/bootloaders (u-boot-qemu-riscv64): 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 2d39d51e1f..be5e4eebb1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -751,6 +751,9 @@ to Novena upstream, does not load u-boot.img from the first partition.") ("firmware-m0" ,rk3399-cortex-m0) ,@(package-native-inputs base)))))) +(define-public u-boot-qemu-riscv64 + (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) + (define-public u-boot-qemu-riscv64-smode (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu")) -- cgit v1.2.3 From 1f9fae008d52a9901d016d418d3931f6e9ccbd00 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 2 Feb 2020 02:07:17 +0000 Subject: gnu: u-boot-qemu-riscv64-smode: Patch to fix boot menu. * gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch: New patch. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/bootloaders (u-boot-qemu-riscv64-smode): Add patch. --- gnu/packages/bootloaders.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index be5e4eebb1..63a88dd7ec 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -755,7 +755,13 @@ to Novena upstream, does not load u-boot.img from the first partition.") (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) (define-public u-boot-qemu-riscv64-smode - (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu")) + (let ((base (make-u-boot-package "qemu-riscv64_smode" "riscv64-linux-gnu"))) + (package + (inherit base) + (source (origin + (inherit (package-source u-boot)) + (patches + (search-patches "u-boot-riscv64-fix-extlinux.patch"))))))) (define-public u-boot-sifive-fu540 (make-u-boot-package "sifive_fu540" "riscv64-linux-gnu")) -- cgit v1.2.3