[PATCH 2/2] net: Handle CONFIG_(SPL_)NET for conditional components

Nathan Rossi nathan at nathanrossi.com
Tue Jan 28 08:51:13 CET 2020


Use CONFIG_$(SPL_)NET to conditionally select object files depending on
the SPL or U-Boot specific configuration.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 net/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/Makefile b/net/Makefile
index fef71b940a..8e45103168 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -5,20 +5,20 @@
 
 #ccflags-y += -DDEBUG
 
-obj-$(CONFIG_NET)      += arp.o
+obj-$(CONFIG_$(SPL_)NET) += arp.o
 obj-$(CONFIG_CMD_BOOTP) += bootp.o
 obj-$(CONFIG_CMD_CDP)  += cdp.o
 obj-$(CONFIG_CMD_DNS)  += dns.o
 ifdef CONFIG_DM_ETH
-obj-$(CONFIG_NET)      += eth-uclass.o
+obj-$(CONFIG_$(SPL_)NET) += eth-uclass.o
 else
-obj-$(CONFIG_NET)      += eth_legacy.o
+obj-$(CONFIG_$(SPL_)NET) += eth_legacy.o
 endif
 obj-$(CONFIG_DM_MDIO)  += mdio-uclass.o
 obj-$(CONFIG_DM_MDIO_MUX) += mdio-mux-uclass.o
-obj-$(CONFIG_NET)      += eth_common.o
+obj-$(CONFIG_$(SPL_)NET) += eth_common.o
 obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
-obj-$(CONFIG_NET)      += net.o
+obj-$(CONFIG_$(SPL_)NET) += net.o
 obj-$(CONFIG_CMD_NFS)  += nfs.o
 obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_PCAP) += pcap.o
---
2.24.1


More information about the U-Boot mailing list