diff options
| author | Simon Glass <sjg@chromium.org> | 2020-04-26 09:12:54 -0600 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2020-04-30 17:40:16 +0800 |
| commit | 52b9beb5276def9e261ded543e9f4ff9940a064e (patch) | |
| tree | cbd0bda3e454490969991c69d6462a4e0fe7f655 | |
| parent | c793dbdb902baafeef869e3b3b16049af9c11979 (diff) | |
| download | u-boot-52b9beb5276def9e261ded543e9f4ff9940a064e.zip u-boot-52b9beb5276def9e261ded543e9f4ff9940a064e.tar.gz u-boot-52b9beb5276def9e261ded543e9f4ff9940a064e.tar.bz2 | |
x86: apl: Skip init code when chain loading
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@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | arch/x86/cpu/apollolake/fsp_s.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c index 17cf168..7ef169b 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. |