| Message ID | 20200408190314.695067-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | firmware: imx: fix compile-testing | expand |
On Wed, Apr 08, 2020 at 09:02:57PM +0200, Arnd Bergmann wrote: > It is nice to allow compile-testing the firmware drivers, but this > fails when the dependency is a loadable module: > > aarch64-linux-ld: drivers/firmware/imx/scu-pd.o: in function `imx_sc_pd_power': > scu-pd.c:(.text+0xd8): undefined reference to `imx_scu_call_rpc' > aarch64-linux-ld: scu-pd.c:(.text+0x108): undefined reference to `imx_scu_call_rpc' > aarch64-linux-ld: drivers/firmware/imx/scu-pd.o: in function `imx_sc_pd_probe': > > Change the dependencies to ensure that any driver we depend on is > either reachable or we are compile-testing and it is disabled, > effectively reverting most of the previous changes that turned > out to be incorrect. > > Fixes: a9f85f93ed73 ("firmware: imx: add COMPILE_TEST support") > Fixes: 5b00b8375416 ("firmware: imx: add COMPILE_TEST for IMX_SCU driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Shawn Guo <shawnguo@kernel.org>
diff --git a/drivers/firmware/imx/Kconfig b/drivers/firmware/imx/Kconfig index 116707a075f3..1d2e5b85d7ca 100644 --- a/drivers/firmware/imx/Kconfig +++ b/drivers/firmware/imx/Kconfig @@ -12,7 +12,7 @@ config IMX_DSP config IMX_SCU bool "IMX SCU Protocol driver" - depends on IMX_MBOX || COMPILE_TEST + depends on IMX_MBOX help The System Controller Firmware (SCFW) is a low-level system function which runs on a dedicated Cortex-M core to provide power, clock, and @@ -24,6 +24,6 @@ config IMX_SCU config IMX_SCU_PD bool "IMX SCU Power Domain driver" - depends on IMX_SCU || COMPILE_TEST + depends on IMX_SCU help The System Controller Firmware (SCFW) based power domain driver.
It is nice to allow compile-testing the firmware drivers, but this fails when the dependency is a loadable module: aarch64-linux-ld: drivers/firmware/imx/scu-pd.o: in function `imx_sc_pd_power': scu-pd.c:(.text+0xd8): undefined reference to `imx_scu_call_rpc' aarch64-linux-ld: scu-pd.c:(.text+0x108): undefined reference to `imx_scu_call_rpc' aarch64-linux-ld: drivers/firmware/imx/scu-pd.o: in function `imx_sc_pd_probe': Change the dependencies to ensure that any driver we depend on is either reachable or we are compile-testing and it is disabled, effectively reverting most of the previous changes that turned out to be incorrect. Fixes: a9f85f93ed73 ("firmware: imx: add COMPILE_TEST support") Fixes: 5b00b8375416 ("firmware: imx: add COMPILE_TEST for IMX_SCU driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/firmware/imx/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)