Hi Heinrich,

On Mon, 9 Nov 2020 at 00:42, Heinrich Schuchardt <xypron.g...@gmx.de> wrote:
>
> On 09.11.20 05:08, Simon Glass wrote:
> > This test cannot work unless CONFIG_BLOBLIST is enabled. Update it to add
> > that condition.
> >
> > Reported-by: Kever Yang <kever.y...@rock-chips.com>
> > Signed-off-by: Simon Glass <s...@chromium.org>
> > ---
> >
> >  test/Makefile | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/test/Makefile b/test/Makefile
> > index 1c930b31485..cdbfa61cda3 100644
> > --- a/test/Makefile
> > +++ b/test/Makefile
> > @@ -2,7 +2,9 @@
> >  #
> >  # (C) Copyright 2012 The Chromium Authors
> >
> > +ifneq ($(CONFIG_$(SPL_)BLOBLIST),)
> >  obj-$(CONFIG_$(SPL_)CMDLINE) += bloblist.o
> > +endif
> >  obj-$(CONFIG_$(SPL_)CMDLINE) += cmd/
> >  obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_ut.o
> >  obj-$(CONFIG_$(SPL_)CMDLINE) += command_ut.o
> >
>
> This patch conflicts with my patch
>
> [1/1] test: test/bloblist.c depends on asm/state.h
> https://patchwork.ozlabs.org/project/uboot/patch/20201031073806.30736-1-xypron.g...@gmx.de/
>
> It seems that my patch is obsoleted by the first patch of Kever's series:
>
> test: Avoid assuming sandbox board for bloblist test
> https://patchwork.ozlabs.org/project/uboot/patch/20201108210834.1.I08cec35c8482583834811d48894f358277c662aa@changeid/

I believe your patch was already applied, so there should not be a
patch conflict.

Yes there was a request to be able to run the test on boards other
than sandbox. I think we should try to do that if possible.

Regards,
Simon

Reply via email to