On Wed, Aug 25, 2021 at 01:00:46PM +0800, Bin Meng wrote:
> On Wed, Aug 25, 2021 at 10:01 AM Tom Rini <trini@konsulko.com> wrote:
> >
> > On Wed, Aug 25, 2021 at 08:05:17AM +0800, Bin Meng wrote:
> >
> > > At present U-Boot CI testing is still using QEMU 4.2.0 which is
> > > pretty old. Let's bump up to QEMU 6.1.0.
> > >
> > > ninja-build is added as the prerequisite required by QEMU 6.1.0.
> > >
> > > Note there is a bug in QEMU 6.1.0 Xilinx Zynq UART emulation codes.
> > > A quick fix [1] was posted on QEMU mailing list but it it too late
> > > for 6.1.0 release. Hence my custom repo is used that contains this
> > > fix on top of the v6.1.0 release tag at the time being. We should
> > > switch to QEMU official repo once the fix is merged in next release.
> > >
> > > [1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/
> >
> > Can we cherry-pick this from upstream?  How long is it likely to take
> > before say 6.1.1 is out?
> 
> There is probably no 6.1.1 per QEMU release cadence. The fix has not
> been applied yet, so we cannot cherry pick it up now.
> 
> If using a custom repo is a problem, how about "wget <patch> from
> patchwork" and "git am" on top of the official repo?

Yeah, I think that would be a good alternative.

-- 
Tom