[PATCH 1/4] ARM: imx: Add bmode support for iMX7

[Stefano Babic]

On 05.08.20 16:40, Marek Vasut wrote:
> On 8/5/20 3:59 PM, Stefano Babic wrote:
>> Hi Marek,
> 
> Hi,
> 
>> On 05.08.20 15:34, Marek Vasut wrote:
>>> Add the basic differentiation between i.MX6 and i.MX7 into the bmode
>>> command, the mechanism really works almost the same on both platforms.
>>>
>>> Signed-off-by: Marek Vasut <marex at denx.de>
>>> Cc: Fabio Estevam <festevam at gmail.com>
>>> Cc: NXP i.MX U-Boot Team <uboot-imx at nxp.com>
>>> Cc: Peng Fan <peng.fan at nxp.com>
>>> Cc: Stefano Babic <sbabic at denx.de>
>>> ---
>>>  arch/arm/include/asm/mach-imx/sys_proto.h |  6 +++++-
>>>  arch/arm/mach-imx/Kconfig                 |  2 +-
>>>  arch/arm/mach-imx/init.c                  | 12 +++++++++---
>>>  arch/arm/mach-imx/mx7/soc.c               |  8 ++++++++
>>>  4 files changed, 23 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
>>> index ab94024c9b..2d18b1f56b 100644
>>> --- a/arch/arm/include/asm/mach-imx/sys_proto.h
>>> +++ b/arch/arm/include/asm/mach-imx/sys_proto.h
>>> @@ -78,7 +78,7 @@ struct bd_info;
>>>  #define is_imx8qxp() (is_cpu_type(MXC_CPU_IMX8QXP))
>>>  
>>>  #ifdef CONFIG_MX6
>>> -#define IMX6_SRC_GPR10_BMODE		BIT(28)
>>> +#define IMX6_SRC_GPR10_BMODE			BIT(28)
>>>  
>>>  #define IMX6_BMODE_MASK			GENMASK(7, 0)
>>>  #define	IMX6_BMODE_SHIFT		4
>>> @@ -126,6 +126,10 @@ void gpr_init(void);
>>>  
>>>  #endif /* CONFIG_MX6 */
>>>  
>>> +#ifdef CONFIG_MX7
>>> +#define IMX7_SRC_GPR10_BMODE			BIT(28)
>>> +#endif
>>> +
>>
>> It is questionable why we need two different defines, that also have
>> exactly the same definition. Do we really need to differentiate and to
>> use #ifdef ?
> 
> Yes, because this file is also used by iMXes which are not 6/7 .

Yes, but does it disturb ? There should be a define SRC_GPR10_BMODE that
is not used at all if we build for mx3/mx5. I just prefer to reduce the
number of #ifdef, when they are not strictly required.

Regards,
Stefano

-- 
=====================================================================
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
=====================================================================