[PATCH v2 1/2] arm: stm32mp: Really fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled

[Patrice CHOTARD]

On 8/25/23 10:53, Patrice CHOTARD wrote:
> 
> 
> On 8/22/23 09:51, Bhupesh Sharma wrote:
>> While 23e20b2fa6 ("arm: stm32mp: Fix compilation issue when
>> SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled") tried fixing
>> this issue, fix it really by adding #if checks for SYS_ICACHE_OFF
>> and SYS_DCACHE_OFF.
>>
>> Cc: Patrice Chotard <patrice.chotard at foss.st.com>
>> Cc: Patrick Delaunay <patrick.delaunay at foss.st.com>
>> Signed-off-by: Bhupesh Sharma <bhupesh.sharma at linaro.org>
>> ---
>>  arch/arm/mach-stm32mp/cpu.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
>> index e2f67fc423..8ed065b389 100644
>> --- a/arch/arm/mach-stm32mp/cpu.c
>> +++ b/arch/arm/mach-stm32mp/cpu.c
>> @@ -90,10 +90,10 @@ static void early_enable_caches(void)
>>  	if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
>>  		return;
>>  
>> -	if (!(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))) {
>> +#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
>>  		gd->arch.tlb_size = PGTABLE_SIZE;
>>  		gd->arch.tlb_addr = (unsigned long)&early_tlb;
>> -	}
>> +#endif
>>  
>>  	/* enable MMU (default configuration) */
>>  	dcache_enable();
> 
> Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>
> 
> Thanks
> Patrice

Applied to u-boot-stm32/master

Thanks
Patrice