projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c793dbd
)
x86: apl: Skip init code when chain loading
author
Simon Glass
<sjg@chromium.org>
Sun, 26 Apr 2020 15:12:54 +0000
(09:12 -0600)
committer
Bin Meng
<bmeng.cn@gmail.com>
Thu, 30 Apr 2020 09:40:16 +0000
(17:40 +0800)
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>
arch/x86/cpu/apollolake/fsp_s.c
patch
|
blob
|
history
diff --git
a/arch/x86/cpu/apollolake/fsp_s.c
b/arch/x86/cpu/apollolake/fsp_s.c
index
17cf168
..
7ef169b
100644
(file)
--- 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.