From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?Q?Andr=c3=a9_Przywara?= <andre.przywara@arm.com>
Date: Sun, 22 Jan 2017 01:06:39 +0000
Subject: [U-Boot] [PATCH 08/12] sunxi: prepare for sharing MACH_SUN8I_H3
 config symbol
In-Reply-To: <20170116075939.x7rxr4smivgue4to@lukather>
References: <1484271004-19681-1-git-send-email-andre.przywara@arm.com>
 <1484271004-19681-9-git-send-email-andre.przywara@arm.com>
 <20170116075939.x7rxr4smivgue4to@lukather>
Message-ID: <b00b24fe-c8ef-18da-f59c-e09b82d4b76e@arm.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 16/01/17 07:59, Maxime Ripard wrote:
> On Fri, Jan 13, 2017 at 01:30:00AM +0000, Andre Przywara wrote:
>> The Allwinner H5 is very close to the H3 SoC, but has ARMv8 cores.
>> To allow sharing the clocks, GPIO and driver code easily, create an
>> architecture agnostic MACH_SUN8I_H3_H5 Kconfig symbol.
>> Rename the existing symbol to MACH_SUN8I_H3_H5 where code is shared and
>> let it be selected by a new shared Kconfig option.
> 
> This isn't really related to sun8i anymore, how about
> MACH_SUNXI_H3_H5?

Even better, I renamed it.

> 
> [...]
> 
>>  
>> +__weak void tzpc_init(void)
>> +{
>> +}
>> +
>>  void s_init(void)
>>  {
>>  	/*
>> @@ -188,10 +192,9 @@ void s_init(void)
>>  		"mcr p15, 0, r0, c1, c0, 1\n"
>>  		::: "r0");
>>  #endif
>> -#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3
>> -	/* Enable non-secure access to some peripherals */
>> +
>> +	/* Enable non-secure access to some peripherals (only if needed) */
>>  	tzpc_init();
>> -#endif
> 
> This looks unrelated to your patch.

Ah, thanks for spotting this. It was an attempt to get rid of some
#ifdef's at all (by using a weak function), but I think I can just drop
it in this patch to keep the patch smaller and confined to one purpose.

Cheers,
Andre.