branch master updated: gnu: u-boot-qemu-riscv64-smode: Patch to fix boot menu.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

vagrantc pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1f9fae0  gnu: u-boot-qemu-riscv64-smode: Patch to fix boot menu.
1f9fae0 is described below

commit 1f9fae008d52a9901d016d418d3931f6e9ccbd00
Author: Vagrant Cascadian <address@hidden>
AuthorDate: Sun Feb 2 02:07:17 2020 +0000

    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/local.mk                                       |  1 +
 gnu/packages/bootloaders.scm                       |  8 +++-
 .../patches/u-boot-riscv64-fix-extlinux.patch      | 54 ++++++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 24ab39a..4251654 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1430,6 +1430,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/tomb-fix-errors-on-open.patch           \
   %D%/packages/patches/tuxpaint-stamps-path.patch              \
   %D%/packages/patches/txr-shell.patch                         \
+  %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch       \
   %D%/packages/patches/ucx-tcp-iface-ioctl.patch               \
   %D%/packages/patches/udiskie-no-appindicator.patch           \
   %D%/packages/patches/unzip-CVE-2014-8139.patch               \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index be5e4ee..63a88dd 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"))
diff --git a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch 
b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch
new file mode 100644
index 0000000..3feeb1d
--- /dev/null
+++ b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch
@@ -0,0 +1,54 @@
+From 3fc056f0b9f7c26e58a1e947c8c0184e55919614 Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <address@hidden>
+Date: Wed, 21 Aug 2019 12:07:20 -0700
+Subject: [PATCH] qemu-riscv64_smode, sifive-fu540: fix extlinux (define
+ preboot)
+Forwarded: https://patchwork.ozlabs.org/patch/1151125/
+
+Commit 37304aaf60bf92a5dc3ef222ba520698bd862a44 removed preboot
+commands in RISC-V targets and broke extlinux support as reported
+by Fu Wei <address@hidden>.
+
+The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT
+to Kconfig.
+
+Signed-off-by: David Abdurachmanov <address@hidden>
+---
+ configs/qemu-riscv64_smode_defconfig | 2 ++
+ configs/sifive_fu540_defconfig       | 2 ++
+ include/configs/sifive-fu540.h       | 4 ----
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+Index: u-boot/configs/qemu-riscv64_smode_defconfig
+===================================================================
+--- u-boot.orig/configs/qemu-riscv64_smode_defconfig
++++ u-boot/configs/qemu-riscv64_smode_defconfig
+@@ -14,3 +14,5 @@ CONFIG_CMD_NVEDIT_EFI=y
+ CONFIG_OF_PRIOR_STAGE=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_DM_MTD=y
++CONFIG_USE_PREBOOT=y
++CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr 
${fdtcontroladdr};"
+Index: u-boot/configs/sifive_fu540_defconfig
+===================================================================
+--- u-boot.orig/configs/sifive_fu540_defconfig
++++ u-boot/configs/sifive_fu540_defconfig
+@@ -12,3 +12,5 @@ CONFIG_DISPLAY_BOARDINFO=y
+ CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00"
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_DM_MTD=y
++CONFIG_USE_PREBOOT=y
++CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr 
${fdtcontroladdr};"
+Index: u-boot/include/configs/sifive-fu540.h
+===================================================================
+--- u-boot.orig/include/configs/sifive-fu540.h
++++ u-boot/include/configs/sifive-fu540.h
+@@ -40,8 +40,4 @@
+       "ramdisk_addr_r=0x88300000\0" \
+       BOOTENV
+ 
+-#define CONFIG_PREBOOT \
+-      "setenv fdt_addr ${fdtcontroladdr};" \
+-      "fdt addr ${fdtcontroladdr};"
+-
+ #endif /* __CONFIG_H */