From patchwork Wed Feb 19 02:45:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 236544 List-Id: U-Boot discussion From: sjg at chromium.org (Simon Glass) Date: Tue, 18 Feb 2020 19:45:56 -0700 Subject: [PATCH v2 2/4] x86: apl: Skip init code when chain loading In-Reply-To: <20200219024559.233483-1-sjg@chromium.org> References: <20200219024559.233483-1-sjg@chromium.org> Message-ID: <20200219024559.233483-3-sjg@chromium.org> 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 --- 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 b2d9130841..3ee816f44b 100644 --- a/arch/x86/cpu/apollolake/fsp_s.c +++ b/arch/x86/cpu/apollolake/fsp_s.c @@ -565,6 +565,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.