[PATCH v4 2/9] x86: apl: Skip init code when chain loading

Simon Glass sjg at chromium.org
Sun Apr 26 17:12:54 CEST 2020

When U-Boot is not the first-stage bootloader the FSP-S init must be
skipped. Update it to add a check.

Signed-off-by: Simon Glass <sjg at chromium.org>

Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/x86/cpu/apollolake/fsp_s.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index 17cf1682ad..7ef169b147 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -566,6 +566,8 @@ int arch_fsp_init_r(void)
 	struct udevice *dev, *itss;
 	int ret;
+	if (!ll_boot_init())
+		return 0;
 	 * This must be called before any devices are probed. Put any probing
 	 * into arch_fsps_preinit() above.

More information about the U-Boot mailing list