From: Simon Glass <sjg@chromium.org>
Date: Tue, 22 Sep 2020 18:45:36 +0000 (-0600)
Subject: x86: apl: Check low-level init in FSP-S pre-init
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=96bf9be89e02825d70969b3912a4fe859fc1660b;p=u-boot.git

x86: apl: Check low-level init in FSP-S pre-init

If U-Boot is not running FSP-S it should not do the pre-init either. Add a
condition to handle this.

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

diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index e54b0ac104..715ceab6ac 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -157,6 +157,8 @@ int arch_fsps_preinit(void)
 	struct udevice *itss;
 	int ret;
 
+	if (!ll_boot_init())
+		return 0;
 	ret = irq_first_device_type(X86_IRQT_ITSS, &itss);
 	if (ret)
 		return log_msg_ret("no itss", ret);