summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerve Codina <herve.codina@bootlin.com>2023-05-23 10:59:01 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-30 12:25:25 +0100
commit192d43e91e0fdbd51b64ba36e773cbdf38dda505 (patch)
treeb37577d8482ae53a585e2490629dbbd210c18677
parent2474e05467c00f7d51af3039b664de6886325257 (diff)
downloadlinux-stable-192d43e91e0fdbd51b64ba36e773cbdf38dda505.tar.gz
linux-stable-192d43e91e0fdbd51b64ba36e773cbdf38dda505.tar.bz2
linux-stable-192d43e91e0fdbd51b64ba36e773cbdf38dda505.zip
soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST
In order to compile tsa.c and qmc.c, CONFIG_CPM must be set. Without this dependency, the linker fails with some missing symbols for COMPILE_TEST configurations that need QMC without enabling CPM. Signed-off-by: Herve Codina <herve.codina@bootlin.com> Reported-by: kernel test robot <lkp@intel.com> Link: https://lore.kernel.org/oe-kbuild-all/202305160221.9XgweObz-lkp@intel.com/ Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Link: https://lore.kernel.org/r/20230523085902.75837-2-herve.codina@bootlin.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/soc/fsl/qe/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig
index 7268c2fbcbc1..e0d096607fef 100644
--- a/drivers/soc/fsl/qe/Kconfig
+++ b/drivers/soc/fsl/qe/Kconfig
@@ -36,7 +36,7 @@ config UCC
config CPM_TSA
tristate "CPM TSA support"
depends on OF && HAS_IOMEM
- depends on CPM1 || COMPILE_TEST
+ depends on CPM1 || (CPM && COMPILE_TEST)
help
Freescale CPM Time Slot Assigner (TSA)
controller.
@@ -47,7 +47,7 @@ config CPM_TSA
config CPM_QMC
tristate "CPM QMC support"
depends on OF && HAS_IOMEM
- depends on CPM1 || (FSL_SOC && COMPILE_TEST)
+ depends on CPM1 || (FSL_SOC && CPM && COMPILE_TEST)
depends on CPM_TSA
help
Freescale CPM QUICC Multichannel Controller