[U-Boot] [PATCH 1/2] arm: imx6: tqma6: use CONFIG_TQM6x for SOM specific settings

[Stefano Babic]

On 03/02/2017 15:20, Markus Niebel wrote:
> From: Markus Niebel <Markus.Niebel at tq-group.com>
> 
> We have a Kconfig name for the module types. Let's Use it.
> Some feature selections and configurations are based on the
> module. Module selection selects the CPU type.
> 
> Signed-off-by: Markus Niebel <Markus.Niebel at tq-group.com>
> ---
>  board/tqc/tqma6/tqma6_mba6.c | 13 +++++++------
>  include/configs/tqma6.h      |  8 ++++----
>  2 files changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
> index 4db1a0b..b51751d 100644
> --- a/board/tqc/tqma6/tqma6_mba6.c
> +++ b/board/tqc/tqma6/tqma6_mba6.c
> @@ -54,19 +54,19 @@ DECLARE_GLOBAL_DATA_PTR;
>  	PAD_CTL_DSE_40ohm | PAD_CTL_HYS |			\
>  	PAD_CTL_ODE | PAD_CTL_SRE_FAST)
>  
> -#if defined(CONFIG_MX6Q)
> +#if defined(CONFIG_TQMA6Q)
>  
>  #define IOMUX_SW_PAD_CTRL_GRP_DDR_TYPE_RGMII	0x02e0790
>  #define IOMUX_SW_PAD_CTRL_GRP_RGMII_TERM	0x02e07ac
>  
> -#elif defined(CONFIG_MX6S)
> +#elif defined(CONFIG_TQMA6S)
>  
>  #define IOMUX_SW_PAD_CTRL_GRP_DDR_TYPE_RGMII	0x02e0768
>  #define IOMUX_SW_PAD_CTRL_GRP_RGMII_TERM	0x02e0788
>  
>  #else
>  
> -#error "need to define target CPU"
> +#error "need to select module"
>  
>  #endif
>  
> @@ -259,14 +259,15 @@ int board_phy_config(struct phy_device *phydev)
>  {
>  /*
>   * optimized pad skew values depends on CPU variant on the TQMa6x module:
> - * i.MX6Q/D or i.MX6DL/S
> + * CONFIG_TQMA6Q: i.MX6Q/D
> + * CONFIG_TQMA6S: i.MX6S
>   */
> -#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
> +#if defined(CONFIG_TQMA6Q)
>  #define MBA6X_KSZ9031_CTRL_SKEW	0x0032
>  #define MBA6X_KSZ9031_CLK_SKEW	0x03ff
>  #define MBA6X_KSZ9031_RX_SKEW	0x3333
>  #define MBA6X_KSZ9031_TX_SKEW	0x2036
> -#elif defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
> +#elif defined(CONFIG_TQMA6S)
>  #define MBA6X_KSZ9031_CTRL_SKEW	0x0030
>  #define MBA6X_KSZ9031_CLK_SKEW	0x03ff
>  #define MBA6X_KSZ9031_RX_SKEW	0x3333
> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
> index 09783a2..b47f9b8 100644
> --- a/include/configs/tqma6.h
> +++ b/include/configs/tqma6.h
> @@ -18,17 +18,17 @@
>  /* #endif */
>  
>  /* place code in last 4 MiB of RAM */
> -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
> +#if defined(CONFIG_TQMA6S)
>  #define CONFIG_SYS_TEXT_BASE		0x2fc00000
> -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
> +#elif defined(CONFIG_TQMA6Q)
>  #define CONFIG_SYS_TEXT_BASE		0x4fc00000
>  #endif
>  
>  #include "mx6_common.h"
>  
> -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
> +#if defined(CONFIG_TQMA6S)
>  #define PHYS_SDRAM_SIZE			(512u * SZ_1M)
> -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
> +#elif defined(CONFIG_TQMA6Q)
>  #define PHYS_SDRAM_SIZE			(1024u * SZ_1M)
>  #endif
>  
> 
Reviewed-by : Stefano Babic <sbabic at denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================