[U-Boot] Pull request: u-boot-riscv/master

[Rick Chen]

Hi Lukas

> Hi Rick,
>
> On Wed, 2019-08-14 at 20:15 +0000, Auer, Lukas wrote:
> > Hi Rick,
> >
> > On Wed, 2019-08-14 at 10:20 +0800, Rick Chen wrote:
> > > Hi Lukas
> > >
> > > > > From: Tom Rini [mailto:trini at konsulko.com]
> > > > > Sent: Wednesday, August 14, 2019 12:50 AM
> > > > > To: Open Source Project uboot
> > > > > Cc: u-boot at lists.denx.de; Rick Jian-Zhi Chen(陳建志)
> > > > > Subject: Re: [U-Boot] Pull request: u-boot-riscv/master
> > > > >
> > > > > On Mon, Aug 12, 2019 at 06:23:02PM +0800, uboot at andestech.com wrote:
> > > > >
> > > > > > Hi Tom,
> > > > > >
> > > > > > Please pull some riscv updates:
> > > > > >
> > > > > > - Fix sifive serial y-modem transfer.
> > > > > > - Access CSRs using CSR numbers.
> > > > > > - Update doc sifive-fu540
> > > > > > - Support big endian hosts and target.
> > > > > > - Support SPL and OpenSBI (FW_DYNAMIC firmware) boot.
> > > > > >
> > > > > > https://travis-ci.org/rickchen36/u-boot-riscv/builds/570682542
> > > > > >
> > > > > > Thanks
> > > > > > Rick
> > > > > >
> > > > > >
> > > > > > The following changes since commit
> > > > > feb5a02f869d5678190dfc915ef6c2781b4f7a6c:
> > > > > >   Merge branch 'master' of git://git.denx.de/u-boot-sh (2019-08-10
> > > > > > 17:57:58 -0400)
> > > > > >
> > > > > > are available in the Git repository at:
> > > > > >
> > > > > >   git at gitlab.denx.de:u-boot/custodians/u-boot-riscv.git
> > > > > >
> > > > > > for you to fetch changes up to
> > > > > 30c150bae4e3a61f87a159579cd3784f4d64e79e:
> > > > > >   riscv: qemu: Fix kconfig build warning (2019-08-12 13:30:53 +0800)
> > > > > >
> > > > >
> > > > > There is some change in here that is reliably causing this job to fail, please
> > > > > investigate:
> > > > > https://gitlab.denx.de/u-boot/u-boot/-/jobs/5493
> > >
> > > Can you please check about this failure.
> > > I wonder it may cause from SPL relative patchs.
> > >
> >
> > I'll have a look. I am on vacation the rest of the week, so I will
> > check it out Sunday if I get the chance or early next week.
> >
>
> You are right, patch #2 of the SPL series caused this issue.
> Unfortunately Travis did not catch the problem, likely because the
> compiled device tree was still present from a previous build. I have
> sent the updated patch. Let me know if I should resend the entire
> series.

Thanks for solving this build fail issue.

But the [PATCH v3 10/11] riscv: qemu: add SPL configuration
seem to conflict with u-boot/master.

You shall rebase u-boot/master and send v5 again.
I will apply it ASAP.

Applying: fdtdec: make CONFIG_OF_PRIOR_STAGE available in SPL
Applying: Makefile: support building SPL FIT images without device trees
Applying: spl: fit: use U-Boot device tree when FIT image has no device tree
Applying: riscv: add run mode configuration for SPL
Applying: riscv: add SPL support
Applying: riscv: support SPL stack and global data relocation
Applying: riscv: add a generic FIT generator script
Applying: riscv: set default FIT generator script and build target for
SPL builds
Applying: riscv: qemu: add SPL configuration
error: patch failed: board/emulation/qemu-riscv/qemu-riscv.c:6
error: board/emulation/qemu-riscv/qemu-riscv.c: patch does not apply
Patch failed at 0009 riscv: qemu: add SPL configuration

Thanks,
Rick

>
> Thanks,
> Lukas