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.
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
