[U-Boot,1/3] imx: mx7: fix build warning when CONFIG_IMX_RDC not enabled

Message ID 1502547059-7367-1-git-send-email-peng.fan@nxp.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Peng Fan Aug. 12, 2017, 2:10 p.m.
Fix build warning when CONFIG_IMX_RDC not defined in defconfig.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
---
 arch/arm/mach-imx/mx7/soc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Stefano Babic Aug. 16, 2017, 10:17 a.m. | #1
On 12/08/2017 16:10, Peng Fan wrote:
> Fix build warning when CONFIG_IMX_RDC not defined in defconfig.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  arch/arm/mach-imx/mx7/soc.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
> index 4cf977e..ec74b4c 100644
> --- a/arch/arm/mach-imx/mx7/soc.c
> +++ b/arch/arm/mach-imx/mx7/soc.c
> @@ -31,7 +31,7 @@ U_BOOT_DEVICE(imx7_thermal) = {
>  };
>  #endif
>  
> -#ifdef CONFIG_IMX_RDC
> +#if CONFIG_IS_ENABLED(IMX_RDC)
>  /*
>   * In current design, if any peripheral was assigned to both A7 and M4,
>   * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter
> @@ -245,8 +245,9 @@ int arch_cpu_init(void)
>  	mxs_dma_init();
>  #endif
>  
> -	if (IS_ENABLED(CONFIG_IMX_RDC))
> -		isolate_resource();
> +#if CONFIG_IS_ENABLED(IMX_RDC)
> +	isolate_resource();
> +#endif
>  
>  	return 0;
>  }
> 

Applied to u-boot-imx, -master, thanks !

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 4cf977e..ec74b4c 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -31,7 +31,7 @@  U_BOOT_DEVICE(imx7_thermal) = {
 };
 #endif
 
-#ifdef CONFIG_IMX_RDC
+#if CONFIG_IS_ENABLED(IMX_RDC)
 /*
  * In current design, if any peripheral was assigned to both A7 and M4,
  * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter
@@ -245,8 +245,9 @@  int arch_cpu_init(void)
 	mxs_dma_init();
 #endif
 
-	if (IS_ENABLED(CONFIG_IMX_RDC))
-		isolate_resource();
+#if CONFIG_IS_ENABLED(IMX_RDC)
+	isolate_resource();
+#endif
 
 	return 0;
 }