[PATCH 1/3] common: Makefile: drop duplicated line
From: Peng Fan peng.fan@nxp.com
obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += xyzModem.o is there, no need obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
Signed-off-by: Peng Fan peng.fan@nxp.com --- common/Makefile | 1 - 1 file changed, 1 deletion(-)
diff --git a/common/Makefile b/common/Makefile index bcf352d016..daeea67cf2 100644 --- a/common/Makefile +++ b/common/Makefile @@ -68,7 +68,6 @@ obj-$(CONFIG_DFU_OVER_USB) += dfu.o endif obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o -obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
From: Peng Fan peng.fan@nxp.com
No need to build nvedit.c when CONFIG_$(SPL_)ENV_SUPPORT is n
Signed-off-by: Peng Fan peng.fan@nxp.com --- cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/Makefile b/cmd/Makefile index dd86675bf2..2b2a0c26a6 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -201,7 +201,7 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_)CMD_TLV_EEPROM) += tlv_eeprom.o
# core command -obj-y += nvedit.o +obj-$(CONFIG_$(SPL_)ENV_SUPPORT)+= nvedit.o
obj-$(CONFIG_CMD_BCM_EXT_UTILS) += broadcom/
On Mon, 28 Dec 2020 at 04:44, Peng Fan (OSS) peng.fan@oss.nxp.com wrote:
From: Peng Fan peng.fan@nxp.com
No need to build nvedit.c when CONFIG_$(SPL_)ENV_SUPPORT is n
Signed-off-by: Peng Fan peng.fan@nxp.com
cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Mon, Dec 28, 2020 at 08:13:12PM +0800, Peng Fan (OSS) wrote:
From: Peng Fan peng.fan@nxp.com
No need to build nvedit.c when CONFIG_$(SPL_)ENV_SUPPORT is n
Signed-off-by: Peng Fan peng.fan@nxp.com Reviewed-by: Simon Glass sjg@chromium.org
This breaks a handful of PowerPC platforms that are using the original SPL/etc setup and do make use of environment.
Subject: Re: [PATCH 2/3] cmd: Makefile: build nvedit.c when needed
On Mon, Dec 28, 2020 at 08:13:12PM +0800, Peng Fan (OSS) wrote:
From: Peng Fan peng.fan@nxp.com
No need to build nvedit.c when CONFIG_$(SPL_)ENV_SUPPORT is n
Signed-off-by: Peng Fan peng.fan@nxp.com Reviewed-by: Simon Glass sjg@chromium.org
This breaks a handful of PowerPC platforms that are using the original SPL/etc setup and do make use of environment.
Ah, please drop it.
Thanks, Peng.
-- Tom
From: Peng Fan peng.fan@nxp.com
If no need cache support, not build the cache files, such as in SPL.
Signed-off-by: Peng Fan peng.fan@nxp.com --- arch/arm/cpu/armv8/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index 93d26f9856..0f499699dc 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -9,14 +9,16 @@ obj-y += cpu.o ifndef CONFIG_$(SPL_TPL_)TIMER obj-$(CONFIG_SYS_ARCH_TIMER) += generic_timer.o endif +ifndef CONFIG_$(SPL_)SYS_DCACHE_OFF obj-y += cache_v8.o +obj-y += cache.o +endif ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ARMV8_SPL_EXCEPTION_VECTORS) += exceptions.o else obj-y += exceptions.o obj-y += exception_level.o endif -obj-y += cache.o obj-y += tlb.o obj-y += transition.o ifndef CONFIG_ARMV8_PSCI
On Mon, Dec 28, 2020 at 08:13:13PM +0800, Peng Fan (OSS) wrote:
From: Peng Fan peng.fan@nxp.com
If no need cache support, not build the cache files, such as in SPL.
Signed-off-by: Peng Fan peng.fan@nxp.com
Applied to u-boot/master, thanks!
On Mon, 28 Dec 2020 at 04:44, Peng Fan (OSS) peng.fan@oss.nxp.com wrote:
From: Peng Fan peng.fan@nxp.com
obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += xyzModem.o is there, no need obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
Signed-off-by: Peng Fan peng.fan@nxp.com
common/Makefile | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Mon, Dec 28, 2020 at 08:13:11PM +0800, Peng Fan (OSS) wrote:
From: Peng Fan peng.fan@nxp.com
obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += xyzModem.o is there, no need obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
Signed-off-by: Peng Fan peng.fan@nxp.com Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (4)
-
Peng Fan -
Peng Fan (OSS) -
Simon Glass -
Tom Rini