From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sat, 29 Aug 2020 17:32:10 -0600 Subject: [PATCH v2 51/57] x86: apl: Check low-level init in FSP-S pre-init In-Reply-To: <20200829233217.3821412-1-sjg@chromium.org> References: <20200829233217.3821412-1-sjg@chromium.org> Message-ID: <20200829233217.3821412-17-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- (no changes since v1) 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 e54b0ac1047..715ceab6ac7 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); -- 2.28.0.402.g5ffc5be6b7-goog