diff options
| author | Tom Rini | 2020-06-26 17:40:06 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-06-29 13:34:43 -0400 |
| commit | c87f9ce227380f19ca32d7523269194e1c6348c6 (patch) | |
| tree | 22b3665451477571cbf6dfef92df548fb50e52bd | |
| parent | 8f74e659c42e419cb896e171f00b77023bd35054 (diff) | |
x86: Don't build some unused objects in TPL
In the future if we have separate symbols for DM_SPI_FLASH and
SPL_DM_SPI_FLASH we will not always have function declarations available
for some DM calls. This in turn leads to build warnings but not
failures as the code isn't used and is discarded at link time.
Restructure things to not build code we won't use for TPL anyways.
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/x86/cpu/apollolake/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/lib/Makefile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/cpu/apollolake/Makefile b/arch/x86/cpu/apollolake/Makefile index 3aa2a556765..11621256aeb 100644 --- a/arch/x86/cpu/apollolake/Makefile +++ b/arch/x86/cpu/apollolake/Makefile @@ -3,7 +3,6 @@ # 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 @@ -12,6 +11,7 @@ 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 diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 5cd45874803..1079bf20226 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -22,7 +22,6 @@ obj-y += init_helpers.o obj-y += interrupts.o obj-y += lpc-uclass.o obj-y += mpspec.o -obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o obj-y += northbridge-uclass.o obj-$(CONFIG_I8259_PIC) += i8259.o obj-$(CONFIG_I8254_TIMER) += i8254.o @@ -45,9 +44,12 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_ZBOOT) += zimage.o endif obj-$(CONFIG_USE_HOB) += hob.o +ifndef CONFIG_TPL_BUILD +obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o obj-$(CONFIG_HAVE_FSP) += fsp/ obj-$(CONFIG_FSP_VERSION1) += fsp1/ obj-$(CONFIG_FSP_VERSION2) += fsp2/ +endif ifdef CONFIG_SPL_BUILD ifdef CONFIG_TPL_BUILD |