Commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") 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.

Fixes: 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") Reported-By: Fu Wei wefu@redhat.com Signed-off-by: David Abdurachmanov david.abdurachmanov@sifive.com Signed-off-by: Dimitri John Ledkov dimitri.ledkov@canonical.com ---

changes since my v1 patch: - Add reported-by & fixes tags changes since my v2 patch: - use savedefconfig to order defconfig correctly

Original patch author is David Abdurachmanov

Previously this was submitted in 2019 https://patchwork.ozlabs.org/project/uboot/patch/20190821190720.4286-1-david...

Since then the sifive fu540 portion of this change was merged, but not the qemu one.

Submitting the qemu portion again. Without this change, qemu smode cannot boot Ubuntu's riscv64 cloud images with extlinux.conf.

configs/qemu-riscv64_smode_defconfig | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig index 0000564e41..4a6416e254 100644 --- a/configs/qemu-riscv64_smode_defconfig +++ b/configs/qemu-riscv64_smode_defconfig @@ -6,6 +6,8 @@ CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_BOOTEFI_SELFTEST=y