[PATCH 1/2] spi: Remove unnecessary #ifdefs in header file

Simon Glass sjg at chromium.org
Wed Jul 8 17:01:21 CEST 2020


Hi Bin,

On Tue, 7 Jul 2020 at 19:05, Bin Meng <bmeng.cn at gmail.com> wrote:
>
> Hi Simon,
>
> On Tue, Jul 7, 2020 at 3:58 PM Bin Meng <bmeng.cn at gmail.com> wrote:
> >
> > On Tue, Jul 7, 2020 at 3:56 PM Bin Meng <bmeng.cn at gmail.com> wrote:
> > >
> > > On Mon, Jul 6, 2020 at 10:16 AM Simon Glass <sjg at chromium.org> wrote:
> > > >
> > > > These prevent use of compile-time checks such as:
> > > >
> > > >     if (CONFIG_IS_ENABLED(DM_SPI))
> > > >
> > > > since, for example, if CONFIG_SPL_DM_SPI is not enabled then the
> > > > definitions are not included by spi.h and the C code will not build.
> > > >
> > > > The #ifdefs are unnecessary since there are no conflicts with the pre-DM
> > > > code. In any case we have almost switched over to driver model for SPI.
> > > >
> > > > Drop these #ifdefs from spi.h to fix a build warning on chromebook_coral
> > > > in the following patch.
> > > >
> > > > Signed-off-by: Simon Glass <sjg at chromium.org>
> > > > ---
> > > >
> > > >  include/spi.h | 8 --------
> > > >  1 file changed, 8 deletions(-)
> > > >
> > >
> > > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
> >
> > applied to u-boot-x86, thanks!
>
> Unfortunately this breaks some boards. Could you please take a look?
> https://dev.azure.com/bmeng/GitHub/_build/results?buildId=250&view=logs&j=ed3f42d9-8790-5c10-89c6-b1feb81eb957&t=aa0bab01-4da3-5dc7-7237-a00778129ead

Oh dear, the pre-DM functions conflict. I'll send a v2.

Regards,
SImon


More information about the U-Boot mailing list