[U-Boot] [PATCH v3 00/28] General fixes / cleanup for RISC-V and improvements to qemu-riscv

[Bin Meng]

Hi Rick,

On Tue, Nov 13, 2018 at 2:41 PM Rick Chen <rickchen36 at gmail.com> wrote:
>
> > > This patch series includes general fixes and cleanup for RISC-V. It also adds
> > > support for booting Linux on qemu-riscv. At the moment, only single-core
> > > systems are supported. Support for multi-core systems will be added with a
> > > future patch series.
> > >
> > > To boot Linux on qemu-riscv, Linux must be compiled into BBL as a payload. BBL
> > > must be included in a FIT image and supplied to QEMU with the -kernel
> > > parameter. Its location in memory is embedded in the device tree, which QEMU
> > > passes to u-boot.
> > > To test this, QEMU and riscv-pk (BBL) must be modified. QEMU is modified to add
> > > support for loading binary files (FIT images in this case) in addition to ELF files.
> > > riscv-pk must be modified to adjust the link address. A pull request for QEMU,
> > > which implements this, is available at [1]. A modified version of riscv-pk is
> > > available at [2].
> > >
> > > This series applies on top of u-boot-dm/next.
> > >
>
> Hi Lukas
>
> Apply on top of u-boot-dm/next is ok.
> But apply on u-boot.git will have some conflicts.
>

Lukas's series is based on the VirtIO support which is currently in
the u-boot-dm/master tree. I believe Simon is going to send a PR as
soon as merge window opens tomorrow if everything goes well.

> Applying: riscv: qemu: use device tree passed by prior boot stage
> error: patch failed: board/emulation/qemu-riscv/qemu-riscv.c:9
> error: board/emulation/qemu-riscv/qemu-riscv.c: patch does not apply
> Patch failed at 0001 riscv: qemu: use device tree passed by prior boot stage
>
> May I ask which tree do you want to merge into mainline ?
> from dm tree or riscv tree ?
> So the merge of patch work  can go smoothly.
>

I think you can wait for Simon's dm tree get merged in u-boot/master,
then file PR after that. Thanks!

Regards,
Bin