[v2,1/2] soc: fsl: cpm1: Fix TSA and QMC dependencies in case of COMPILE_TEST

Message ID 20230523085902.75837-2-herve.codina@bootlin.com
State New
Headers
Series Fix COMPILE_TEST dependencies for CPM uart, TSA and QMC |

Commit Message

Herve Codina May 23, 2023, 8:59 a.m. UTC
  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/
---
 drivers/soc/fsl/qe/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Randy Dunlap May 25, 2023, 4:26 p.m. UTC | #1
On 5/23/23 01:59, Herve Codina wrote:
> 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/

Fixes all of my CPM build issues. (with patch 2/2 also applied)
Thanks.

Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

> ---
>  drivers/soc/fsl/qe/Kconfig | 4 ++--
>  1 file 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
  

Patch

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