Skip to contentSkip to conversation

common: Makefile: drop duplicated line

PATCH New Peng Fan (OSS) 4 participants 9 messages Dec 28, 2020 – Jan 18, 2021 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 common: Makefile: drop duplicated line

From: Peng Fan <[email protected]>

obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += xyzModem.o is there, no need obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o

---
 common/Makefile | 1 -
 1 file changed, 1 deletion(-)
common/Makefile +0 -1
index bcf352d016..daeea67cf2 100644
@@ -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
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/3 cmd: Makefile: build nvedit.c when needed

From: Peng Fan <[email protected]>

No need to build nvedit.c when CONFIG_$(SPL_)ENV_SUPPORT is n

---
 cmd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
cmd/Makefile +1 -1
index dd86675bf2..2b2a0c26a6 100644
@@ -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/
 
Signature · 1 line
2.28.0
#3 lore raw

PATCH 2/3 cmd: Makefile: build nvedit.c when needed

In reply to Peng Fan (OSS)
Quoted 6 lines · Peng Fan (OSS)

From: Peng Fan <[email protected]>

No need to build nvedit.c when CONFIG_$(SPL_)ENV_SUPPORT is n

This breaks a handful of PowerPC platforms that are using the original SPL/etc setup and do make use of environment.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/6378a026/attachment.sig>
#4 lore raw

PATCH 2/3 cmd: Makefile: build nvedit.c when needed

Quoted 6 lines

Subject: Re: [PATCH 2/3] cmd: Makefile: build nvedit.c when needed

Quoted 2 lines · Peng Fan (OSS)

From: Peng Fan <[email protected]>

Quoted 7 lines
Quoted 4 lines

No need to build nvedit.c when CONFIG_$(SPL_)ENV_SUPPORT is n

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.

Quoted 3 lines

--
Tom

#5 lore raw

PATCH 3/3 armv8: Makefile: build cache files when needed

In reply to Peng Fan (OSS)

From: Peng Fan <[email protected]>

If no need cache support, not build the cache files, such as in SPL.

---
 arch/arm/cpu/armv8/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/cpu/armv8/Makefile +3 -1
index 93d26f9856..0f499699dc 100644
@@ -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
Signature · 1 line
2.28.0
#6 lore raw

PATCH 3/3 armv8: Makefile: build cache files when needed

Quoted 5 lines · Peng Fan (OSS)

From: Peng Fan <[email protected]>

If no need cache support, not build the cache files, such as in SPL.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/f63f82dc/attachment.sig>
#8 lore raw

PATCH 1/3 common: Makefile: drop duplicated line

In reply to Peng Fan (OSS)
Quoted 7 lines · Peng Fan (OSS)

From: Peng Fan <[email protected]>

obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += xyzModem.o is there, no need obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/8e846352/attachment.sig>