From patchwork Tue Jan 28 08:15:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Rossi X-Patchwork-Id: 240353 List-Id: U-Boot discussion From: nathan at nathanrossi.com (Nathan Rossi) Date: Tue, 28 Jan 2020 08:15:48 +0000 Subject: [PATCH v2 2/2] net: Handle CONFIG_(SPL_)NET for conditional components In-Reply-To: <20200128081548.458113-1-nathan@nathanrossi.com> References: <20200128081548.458113-1-nathan@nathanrossi.com> Message-ID: <20200128081548.458113-2-nathan@nathanrossi.com> Use CONFIG_$(SPL_)NET to conditionally select object files depending on the SPL or U-Boot specific configuration. Signed-off-by: Nathan Rossi --- net/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- 2.24.1 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