[U-Boot] [PATCH] qemu-riscv64_smode, sifive-fu540: fix extlinux (define preboot)

[Bin Meng]

Hi David,

On Thu, Aug 22, 2019 at 3:07 AM David Abdurachmanov
<david.abdurachmanov at gmail.com> wrote:
>
> Commit 37304aaf60bf92a5dc3ef222ba520698bd862a44 removed preboot
> commands in RISC-V targets and broke extlinux support as reported
> by Fu Wei <wefu at redhat.com>.

I think you need add a "Reported-By" tag instead of writing this in
the commit message.

And a "Fixes: commit-id ("commit title") format as well.

Please describe the commit title using something like:

riscv: fix extlinux (define preboot)

as it impacts more than one target.

>
> The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT
> to Kconfig.
>
> Signed-off-by: David Abdurachmanov <david.abdurachmanov at sifive.com>
> ---
>  configs/qemu-riscv64_smode_defconfig | 2 ++

What about other QEMU RISC-V targets?

>  configs/sifive_fu540_defconfig       | 2 ++
>  include/configs/sifive-fu540.h       | 4 ----
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
> index 74743a5ebe..2e1f7fa91f 100644
> --- a/configs/qemu-riscv64_smode_defconfig
> +++ b/configs/qemu-riscv64_smode_defconfig
> @@ -9,3 +9,5 @@ CONFIG_DISPLAY_CPUINFO=y
>  CONFIG_DISPLAY_BOARDINFO=y
>  # CONFIG_CMD_MII is not set
>  CONFIG_OF_PRIOR_STAGE=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"

Please insert the config option to the correct place, eg: you can run
it like this:

$ make savedefconfig
$ cp defconfig configs/qemu-riscv64_smode_defconfig

> diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
> index 48865e5f11..a852579309 100644
> --- a/configs/sifive_fu540_defconfig
> +++ b/configs/sifive_fu540_defconfig
> @@ -9,3 +9,5 @@ CONFIG_MISC_INIT_R=y
>  CONFIG_DISPLAY_CPUINFO=y
>  CONFIG_DISPLAY_BOARDINFO=y
>  CONFIG_OF_PRIOR_STAGE=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
> diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h
> index 858b7a7da1..ba4aa0652c 100644
> --- a/include/configs/sifive-fu540.h
> +++ b/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 */
> --

Regards,
Bin