Re: [PATCH] ARM: shmobile: fix build regressions

From: Simon Horman
Date: Mon Dec 17 2018 - 07:47:51 EST


On Wed, Dec 12, 2018 at 11:30:33AM +0100, Simon Horman wrote:
> On Tue, Dec 11, 2018 at 09:58:05AM +0100, Geert Uytterhoeven wrote:
> > Hi Arnd,
> >
> > On Mon, Dec 10, 2018 at 10:00 PM Arnd Bergmann <arnd@xxxxxxxx> wrote:
> > > A number of Kconfig options have become available now to random ARM
> > > platforms outside of ARCH_MULTIPLATFORM, which now causes Kconfig
> > > warnings, and other build errors when those select options that
> > > lack additonal dependencies, e.g.:
> > >
> > > WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER
> > > Depends on [n]: CPU_V7 [=n]
> > > Selected by [y]:
> > > - ARCH_RCAR_GEN2 [=y] && SOC_RENESAS [=y]
> > > - ARCH_R8A73A4 [=y] && SOC_RENESAS [=y] && ARM [=y]
> > >
> > > WARNING: unmet direct dependencies detected for SYS_SUPPORTS_EM_STI
> > > Depends on [n]: GENERIC_CLOCKEVENTS [=n]
> > > Selected by [y]:
> > > - ARCH_EMEV2 [=y] && SOC_RENESAS [=y] && ARM [=y]
> > >
> > > Put the old dependency on ARCH_RENESAS back for the moment to restore
> > > the previous behavior.
> > >
> > > Fixes: 062887bf5ef7 ("ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")
> > > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> > > ---
> > > drivers/soc/renesas/Kconfig | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
> > > index 4d8012e1205c..68bfca6f20dd 100644
> > > --- a/drivers/soc/renesas/Kconfig
> > > +++ b/drivers/soc/renesas/Kconfig
> > > @@ -44,7 +44,7 @@ config ARCH_RZN1
> > > bool
> > > select ARM_AMBA
> > >
> > > -if ARM
> > > +if ARM && ARCH_RENESAS
> >
> > After a closer look, I think restricting this from ARM to ARCH_MULTI_V7
> > should work, too (ARCH_MULTI_V7 selects CPU_V7, and ARCH_MULTIPLATFORM
> > selects GENERIC_CLOCKEVENTS).
>
> Hi Arnd,
>
> what is your preferred way forwards here?
> I'm tempted to take your patch as-is and then work on
> refining the dependency as a follow-up.

I have gone ahead and applied Arnd's patch as a fix for v4.21.
It seems like the safest option for a fix.