Message ID | 20210723161225.47677-1-dimitri.ledkov@canonical.com |
---|---|
State | Superseded |
Delegated to: | Andes |
Headers | show |
Series | qemu-riscv64_smode: fix extlinux (define preboot) | expand |
Hi Dimitri, On Sat, Jul 24, 2021 at 12:12:25AM +0800, Dimitri John Ledkov wrote: > 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. Could you add a "Fixes" tag and a "Reported-by" tag as suggested by Bin? > > Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com> > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> > --- > > Original patch author is David Abdurachmanov > > Previously this was submitted in 2019 > https://patchwork.ozlabs.org/project/uboot/patch/20190821190720.4286-1-david.abdurachmanov@sifive.com/ > > 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..cb674c6a75 100644 > --- a/configs/qemu-riscv64_smode_defconfig > +++ b/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};" The config option should be inserted using "make savedefconfig". e.g. $ make menuconfig choose the config option desired $ make savedefconfig $ cp defconfig configs/qemu-riscv64_smode_defconfig Thanks! Best regards, Leo > -- > 2.30.2 >
On Mon, Jul 26, 2021 at 8:55 AM Leo Liang <ycliang@andestech.com> wrote: > > Hi Dimitri, > > On Sat, Jul 24, 2021 at 12:12:25AM +0800, Dimitri John Ledkov wrote: > > 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. > > Could you add a "Fixes" tag and a "Reported-by" tag as suggested by Bin? > done in v2 > > > > Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com> > > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> > > --- > > > > Original patch author is David Abdurachmanov > > > > Previously this was submitted in 2019 > > https://patchwork.ozlabs.org/project/uboot/patch/20190821190720.4286-1-david.abdurachmanov@sifive.com/ > > > > 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..cb674c6a75 100644 > > --- a/configs/qemu-riscv64_smode_defconfig > > +++ b/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};" > > The config option should be inserted using "make savedefconfig". > > e.g. > $ make menuconfig > choose the config option desired > $ make savedefconfig > $ cp defconfig configs/qemu-riscv64_smode_defconfig > done in v3 > Thanks! > > Best regards, > Leo > > -- > > 2.30.2 > >
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig index 0000564e41..cb674c6a75 100644 --- a/configs/qemu-riscv64_smode_defconfig +++ b/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};"