mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-01-03 17:23:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

armv8: layerscape: don't initialize GIC in SPL

Browse Source 
The BL31 expects the GIC to be uninitialized. Thus, if we are loading
the BL31 by the SPL we must not initialize it. If u-boot is loaded by
the SPL directly, it will initialize the GIC again (in the same
lowlevel_init()).

This was tested on a custom board with SPL loading the BL31 and jumping
to u-boot as BL33 as well as loading u-boot directly by the SPL. In case
the ATF BL1/BL2 is used, this patch won't change anything, because no
SPL is used at all.

Signed-off-by: Michael Walle <michael@walle.cc>
This commit is contained in:
Michael Walle 2020-11-18 17:45:59 +01:00 committed by Tom Rini
parent 7b866825cd
commit 8084e918bc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S
View File

@ -192,6 +192,7 @@ ENTRY(lowlevel_init)
#endif #endif
/* Initialize GIC Secure Bank Status */ /* Initialize GIC Secure Bank Status */
#if !defined(CONFIG_SPL_BUILD)
#if defined(CONFIG_GICV2) || defined(CONFIG_GICV3) #if defined(CONFIG_GICV2) || defined(CONFIG_GICV3)
branch_if_slave x0, 1f branch_if_slave x0, 1f
bl get_gic_offset bl get_gic_offset
@ -205,6 +206,7 @@ ENTRY(lowlevel_init)
bl gic_init_secure_percpu bl gic_init_secure_percpu
#endif #endif
#endif #endif
#endif
100: 100:
branch_if_master x0, x1, 2f branch_if_master x0, x1, 2f