[PATCH AUTOSEL 5.10 55/88] firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected
From: Sasha Levin <sashal@kernel.org>
Date: 2021-07-14 19:50:57
Also in:
linux-arm-kernel, lkml
Subsystem:
system control & power/management interface (scpi/scmi) message protocol drivers, the rest · Maintainers:
Sudeep Holla, Linus Torvalds
From: Sudeep Holla <redacted> [ Upstream commit ab7766b72855e6a68109b915d071181b93086e29 ] 0day CI kernel test robot reported following build error with randconfig 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. Link: https://lore.kernel.org/r/20210603072631.1660963-1-sudeep.holla@arm.com (local) Cc: Etienne Carriere <redacted> Cc: Cristian Marussi <cristian.marussi@arm.com> Reviewed-by: Etienne Carriere <redacted> Reviewed-by: Cristian Marussi <cristian.marussi@arm.com> Tested-by: Cristian Marussi <cristian.marussi@arm.com> Reported-by: kernel test robot <redacted> Signed-off-by: Sudeep Holla <redacted> Signed-off-by: Sasha Levin <sashal@kernel.org> --- 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 6b2ce3f28f7b..7efbf66f117b 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c@@ -918,7 +918,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.30.2