diff mbox series

x86: Don't build some unused objects in TPL

Message ID 20200627120041.11223-1-trini@konsulko.com
State Awaiting Upstream
Delegated to: Tom Rini
Headers show
Series x86: Don't build some unused objects in TPL | expand

Commit Message

Tom Rini June 27, 2020, noon UTC
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.

Cc: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
I ran in to this as part of testing
http://patchwork.ozlabs.org/project/uboot/patch/20200604151153.3980-4-Zhiqiang.Hou@nxp.com/
which we do need to bring in.  I think we might be building a lot of
codde that's then discarded for TPL builds, but didn't think this is the
right place to tackle that in.
---
 arch/x86/cpu/apollolake/Makefile | 2 +-
 arch/x86/lib/Makefile            | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Bin Meng June 27, 2020, 1:10 p.m. UTC | #1
+Simon,

On Sat, Jun 27, 2020 at 8:00 PM Tom Rini <trini@konsulko.com> wrote:
>
> 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.
>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> I ran in to this as part of testing
> http://patchwork.ozlabs.org/project/uboot/patch/20200604151153.3980-4-Zhiqiang.Hou@nxp.com/
> which we do need to bring in.  I think we might be building a lot of
> codde that's then discarded for TPL builds, but didn't think this is the
> right place to tackle that in.
> ---
>  arch/x86/cpu/apollolake/Makefile | 2 +-
>  arch/x86/lib/Makefile            | 4 +++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Simon Glass June 29, 2020, 5:26 p.m. UTC | #2
On Sat, 27 Jun 2020 at 07:10, Bin Meng <bmeng.cn@gmail.com> wrote:
>
> +Simon,
>
> On Sat, Jun 27, 2020 at 8:00 PM Tom Rini <trini@konsulko.com> wrote:
> >
> > 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.
> >
> > Cc: Bin Meng <bmeng.cn@gmail.com>
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> > ---
> > I ran in to this as part of testing
> > http://patchwork.ozlabs.org/project/uboot/patch/20200604151153.3980-4-Zhiqiang.Hou@nxp.com/
> > which we do need to bring in.  I think we might be building a lot of
> > codde that's then discarded for TPL builds, but didn't think this is the
> > right place to tackle that in.

Yes we build far too much with TPL at present I think.

> > ---
> >  arch/x86/cpu/apollolake/Makefile | 2 +-
> >  arch/x86/lib/Makefile            | 4 +++-
> >  2 files changed, 4 insertions(+), 2 deletions(-)
> >
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/arch/x86/cpu/apollolake/Makefile b/arch/x86/cpu/apollolake/Makefile
index 3aa2a556765a..11621256aebc 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 5cd458748038..1079bf20226a 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