| Message ID | 20200706021653.2146278-2-sjg@chromium.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] spi: Remove unnecessary #ifdefs in header file | expand |
On Mon, Jul 6, 2020 at 10:16 AM Simon Glass <sjg at chromium.org> wrote: > > At present the SPL loader is not included in the TPL image so SPL cannot > be loaded. Fix it by including this file for both SPL and TPL. > > Signed-off-by: Simon Glass <sjg at chromium.org> > Fixes: c87f9ce2273 ("x86: Don't build some unused objects in TPL") > --- > > arch/x86/cpu/apollolake/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
On Tue, Jul 7, 2020 at 3:56 PM Bin Meng <bmeng.cn at gmail.com> wrote: > > On Mon, Jul 6, 2020 at 10:16 AM Simon Glass <sjg at chromium.org> wrote: > > > > At present the SPL loader is not included in the TPL image so SPL cannot > > be loaded. Fix it by including this file for both SPL and TPL. > > > > Signed-off-by: Simon Glass <sjg at chromium.org> > > Fixes: c87f9ce2273 ("x86: Don't build some unused objects in TPL") > > --- > > > > arch/x86/cpu/apollolake/Makefile | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Reviewed-by: Bin Meng <bmeng.cn at gmail.com> applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/apollolake/Makefile b/arch/x86/cpu/apollolake/Makefile index 11621256ae..3aa2a55676 100644 --- a/arch/x86/cpu/apollolake/Makefile +++ b/arch/x86/cpu/apollolake/Makefile @@ -3,6 +3,7 @@ # Copyright 2019 Google LLC obj-$(CONFIG_SPL_BUILD) += cpu_spl.o +obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_SPL_BUILD) += systemagent.o obj-y += cpu_common.o @@ -11,7 +12,6 @@ obj-y += cpu.o obj-y += punit.o obj-y += fsp_bindings.o ifdef CONFIG_SPL_BUILD -obj-y += spl.o obj-y += fsp_m.o endif endif
At present the SPL loader is not included in the TPL image so SPL cannot be loaded. Fix it by including this file for both SPL and TPL. Signed-off-by: Simon Glass <sjg at chromium.org> Fixes: c87f9ce2273 ("x86: Don't build some unused objects in TPL") --- arch/x86/cpu/apollolake/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)