From 3fc056f0b9f7c26e58a1e947c8c0184e55919614 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@gmail.com>
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 <wefu@redhat.com>.

The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT
to Kconfig.

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
---
 configs/qemu-riscv64_smode_defconfig | 2 ++
 configs/sifive_fu540_defconfig       | 2 ++
 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
@@ -27,3 +27,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_CLK=y
 CONFIG_DM_MTD=y
 CONFIG_DM_RESET=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
t'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=934b77260240a9fda11066816107425d1fd6dc7d'>root</a>/<a href='/guix/log/guix.scm?id=934b77260240a9fda11066816107425d1fd6dc7d'>guix.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/guix.scm?id=934b77260240a9fda11066816107425d1fd6dc7d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-07-12 01:17:45 +0200'>2022-07-12</span></td><td><a href='/guix/commit/guix.scm?id=4574ef267e543bcac97d9c400f30cb731df29181'>guix: Really export 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 3858275962f1ac567b5dce2355035f9eddea0a05, which
didn't have any effect.

* guix.scm: Explicitly use (guix packages) so #:re-export-and-replace
is effective.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-09-14 11:50:58 +0200'>2021-09-14</span></td><td><a href='/guix/commit/guix.scm?id=3858275962f1ac567b5dce2355035f9eddea0a05'>guix: Replace 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 8531997d2a1e10d574a6e9ab70bc86ade6af4733.

* guix.scm: Use #:re-export-and-replace for 'define-public'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-29 00:00:13 +0200'>2021-06-29</span></td><td><a href='/guix/commit/guix.scm?id=e059adcb6001ab0353d969b24030d0c342f8830e'>(guix) no longer pulls in (guix ftp-client).</a><span class='msg-avail'>...<span class='msg-tooltip'>That choice was made in 2014 and never made much sense.

* guix.scm (%public-modules): Remove 'ftp-client'.
</span></span></td><td>Ludovic Courtès</td></tr>