[PATCH -next] firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected

[Etienne Carriere]

On Thu, 3 Jun 2021 at 14:55, Cristian Marussi <cristian.marussi at arm.com> wrote:
>
> Reviewed-by: Cristian Marussi <cristian.marussi at arm.com>
> Tested-by: Cristian Marussi <cristian.marussi at arm.com>

Likely related to "firmware: arm_scmi: fix deps arm-smccc-discovery
deps in Kconfig"
Thanks for the fix.

Reviewed-by: Etienne Carriere <etienne.carriere at linaro.org>

Regards,
Etienne

>
> > aarch64-linux-ld: drivers/firmware/arm_scmi/driver.o:(.rodata+0x1e0):
> >               undefined reference to `scmi_mailbox_desc'
> >
> > Fix the error by adding CONFIG_MAILBOX dependency for scmi_mailbox_desc.
> >
> > Cc: Etienne Carriere <etienne.carriere at linaro.org>
> > Cc: Cristian Marussi <cristian.marussi at arm.com>
> > Reported-by: kernel test robot <lkp at intel.com>
> > Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>
> > ---
> >  drivers/firmware/arm_scmi/driver.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
> > index 5e8e9337adc7..ca71568c5c41 100644
> > --- a/drivers/firmware/arm_scmi/driver.c
> > +++ b/drivers/firmware/arm_scmi/driver.c
> > @@ -1571,7 +1571,9 @@ ATTRIBUTE_GROUPS(versions);
> >
> >  /* Each compatible listed below must have descriptor associated with it */
> >  static const struct of_device_id scmi_of_match[] = {
> > +#ifdef CONFIG_MAILBOX
> >       { .compatible = "arm,scmi", .data = &scmi_mailbox_desc },
> > +#endif
> >  #ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY
> >       { .compatible = "arm,scmi-smc", .data = &scmi_smc_desc},
> >  #endif
> > --
> > 2.25.1
> >