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: 1230198 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nathanrossi.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi.com header.i=@nathanrossi.com header.a=rsa-sha256 header.s=google header.b=XgUxrM7f; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 486KFV0QL4z9sP3 for ; Tue, 28 Jan 2020 19:16:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E0025818DD; Tue, 28 Jan 2020 09:16:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=nathanrossi.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi.com header.i=@nathanrossi.com header.b="XgUxrM7f"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D003C818DD; Tue, 28 Jan 2020 09:16:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9B1C98188C for ; Tue, 28 Jan 2020 09:16:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nathanrossi.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=nathan@nathanrossi.com Received: by mail-pf1-x442.google.com with SMTP id k29so3724705pfp.13 for ; Tue, 28 Jan 2020 00:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nathanrossi.com; s=google; h=date:message-id:from:to:cc:subject:content-transfer-encoding :mime-version; bh=Sov60Wzhx3hCNOJlevL1FSjP1b99AjkGAHs50NFuvmg=; b=XgUxrM7fnHAZFTBgHyipgqjm4BSBTPTn4vnxjOMPLnxfPFMrQXNmbCgJm4MHDl+nyL MtLa2qS9r5NxJaSd1n7PgF6/AWIDBQBshJazdxh0toWN0+7KSnxBl+uNLuA8malph/pd 8eGvlzkBuQcM/NsArMv3Fr58DEXZw7CLib52ksws76FUvXiKGu0o+pEnCstyw5YIy15Q n0WFcUF85fph5lIt0ymGV/IAJ2HVODskgeDTwYZwY0PYVj3k9MbMnPBxb+bAxg0N443o tODabPHZq4Lax0fi8LaUglyjybpcFirFW34579e2AghCGKw/vL2UnATWjJLUaCCvrJ2E VudQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:from:to:cc:subject :content-transfer-encoding:mime-version; bh=Sov60Wzhx3hCNOJlevL1FSjP1b99AjkGAHs50NFuvmg=; b=Munsn3oUPEwNsnecNXms5dpnngMccToXzkyEtgFKF+SbP+1N8uoPG3YRoI1SLYV09c ntlOCpOGfrTBHLV/bMvRECn/vt6gqDm3UwboUCZZ7X9f+yrxGDVgUAutMjY6OHVXnF3l 8PypWL55J1Xr1uig0n3rb0Jnp1zzMw1L09m8B4eGknXg7fdeSewCytbLWQtWh4xKfOe8 Biy1bRqU8fs9rAEFGiWB0mWmc2t0IHm7E6u75IrZaF+f5EcYR8vPA/1ldV8Ik3uIk3xy uO71Pb4WAKWmfj0Lew5mCDpgh18SKkL+RbE9mcew5z7Z0Sqil/lgm924HE773PQO7SMO amhA== X-Gm-Message-State: APjAAAWKGYT3cU9f7hJlEZJlTu7oWRu2wUmhVFWX2ftevYgBuUFpwLYR SNCpr4UTWfFL/GGNlTQo7bhhZA== X-Google-Smtp-Source: APXvYqx+W1OmFvDcflEqlQS5mv3vCpbmLsAeuJpyY+bxPcpFVqDsm/JlfV2MEZryo+c+bY/UDPJGHA== X-Received: by 2002:a62:a209:: with SMTP id m9mr2738117pff.16.1580199362195; Tue, 28 Jan 2020 00:16:02 -0800 (PST) Received: from [127.0.1.1] ([101.184.13.211]) by smtp.gmail.com with UTF8SMTPSA id n4sm18338221pgg.88.2020.01.28.00.15.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 00:16:01 -0800 (PST) Date: Tue, 28 Jan 2020 08:15:48 +0000 Message-Id: <20200128081548.458113-1-nathan@nathanrossi.com> From: Nathan Rossi To: u-boot@lists.denx.de Subject: [PATCH v2 1/2] spl: Kconfig: Replace CONFIG_SPL_NET_SUPPORT with CONFIG_SPL_NET MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joe Hershberger , Tom Rini Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Replace CONFIG_SPL_NET_SUPPORT with CONFIG_SPL_NET to match CONFIG_NET so that CONFIG_$(SPL_)NET can be used to conditionally select build objects between SPL and U-Boot. Signed-off-by: Nathan Rossi --- Changes in v2: - Missed entry in common/spl/Makefile that already has conditional prefix --- common/Makefile | 2 +- common/spl/Kconfig | 10 +++++----- common/spl/Makefile | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- configs/am335x_evm_defconfig | 2 +- configs/am335x_guardian_defconfig | 2 +- configs/am43xx_evm_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/chromebook_link64_defconfig | 2 +- configs/chromebook_samus_tpl_defconfig | 2 +- configs/pcm051_rev1_defconfig | 2 +- configs/pcm051_rev3_defconfig | 2 +- configs/pengwyn_defconfig | 2 +- configs/qemu-x86_64_defconfig | 2 +- doc/SPL/README.am335x-network | 2 +- lib/tiny-printf.c | 4 ++-- scripts/Makefile.spl | 2 +- tools/buildman/README | 8 ++++---- 18 files changed, 26 insertions(+), 26 deletions(-) --- 2.24.1 diff --git a/common/Makefile b/common/Makefile index 5f62b8d0b1..9bb00dd66e 100644 --- a/common/Makefile +++ b/common/Makefile @@ -71,7 +71,7 @@ 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_NET) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o ifdef CONFIG_SPL_USB_HOST_SUPPORT diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b03a476b9f..abfc719c91 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -556,7 +556,7 @@ config SPL_ETH_SUPPORT drivers in SPL. This permits SPL to load U-Boot over an Ethernet link rather than from an on-board peripheral. Environment support is required since the network stack uses a number of environment - variables. See also SPL_NET_SUPPORT. + variables. See also SPL_NET. config SPL_FS_EXT4 bool "Support EXT filesystems" @@ -847,7 +847,7 @@ config UBI_SPL_SILENCE_MSG endif # if SPL_UBI -config SPL_NET_SUPPORT +config SPL_NET bool "Support networking" help Enable support for network devices (such as Ethernet) in SPL. @@ -856,7 +856,7 @@ config SPL_NET_SUPPORT the network stack uses a number of environment variables. See also SPL_ETH_SUPPORT. -if SPL_NET_SUPPORT +if SPL_NET config SPL_NET_VCI_STRING string "BOOTP Vendor Class Identifier string sent by SPL" help @@ -865,7 +865,7 @@ config SPL_NET_VCI_STRING of a client. This is often used in practice to allow for the DHCP server to specify different files to load depending on if the ROM, SPL or U-Boot itself makes the request -endif # if SPL_NET_SUPPORT +endif # if SPL_NET config SPL_NO_CPU_SUPPORT bool "Drop CPU code in SPL" @@ -1152,7 +1152,7 @@ config SPL_USB_ETHER USB-connected Ethernet link (such as a USB Ethernet dongle) rather than from an onboard peripheral. Environment support is required since the network stack uses a number of environment variables. - See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT. + See also SPL_NET and SPL_ETH_SUPPORT. config SPL_DFU bool "Support DFU (Device Firmware Upgrade)" diff --git a/common/spl/Makefile b/common/spl/Makefile index eaa57f5ce5..ed5ba9e057 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += spl_nand.o obj-$(CONFIG_$(SPL_TPL_)ONENAND_SUPPORT) += spl_onenand.o endif obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o -obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o +obj-$(CONFIG_$(SPL_TPL_)NET) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 9cea85413b..11f6656938 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -16,7 +16,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 335aa8cfa1..4a2bd2e3ce 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -17,7 +17,7 @@ CONFIG_SPL_ETH_SUPPORT=y # CONFIG_SPL_FS_EXT4 is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig index 13974f7c0f..0f84ccc955 100644 --- a/configs/am335x_guardian_defconfig +++ b/configs/am335x_guardian_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="Guardian U-Boot SPL" CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 2e64879beb..55a19738c0 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 523ce00585..402771eed2 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -26,7 +26,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index 5abd690b00..1b1b557922 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -30,7 +30,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y CONFIG_SPL_RTC_SUPPORT=y diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig index cd1cc5ffa1..caa25c7ad5 100644 --- a/configs/chromebook_samus_tpl_defconfig +++ b/configs/chromebook_samus_tpl_defconfig @@ -31,7 +31,7 @@ CONFIG_BLOBLIST_SIZE=0x1000 CONFIG_BLOBLIST_ADDR=0xff7c0000 CONFIG_HANDOFF=y CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y CONFIG_TPL_PCI=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index cbe6594837..d0262e639a 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -22,7 +22,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 744c5827d1..b3e0b9a6a8 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -22,7 +22,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index eadab3e860..e8e0bbf244 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -22,7 +22,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index a37ec4d0d6..f71cc93118 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -30,7 +30,7 @@ CONFIG_LAST_STAGE_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y CONFIG_SPL_RTC_SUPPORT=y diff --git a/doc/SPL/README.am335x-network b/doc/SPL/README.am335x-network index e3cf93f8dc..05d1579a64 100644 --- a/doc/SPL/README.am335x-network +++ b/doc/SPL/README.am335x-network @@ -7,7 +7,7 @@ NAND and bricked (empty) board with only a network cable. I. Building the required images 1. You have to enable generic SPL configuration options (see -doc/README.SPL) as well as CONFIG_SPL_NET_SUPPORT, +doc/README.SPL) as well as CONFIG_SPL_NET, CONFIG_ETH_SUPPORT, CONFIG_SPL_LIBGENERIC_SUPPORT and CONFIG_SPL_LIBCOMMON_SUPPORT in your board configuration file to build SPL with support for booting over the network. Also you have to enable diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index 1138c7012a..db0f23fd1f 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -47,7 +47,7 @@ static void div_out(struct printf_info *info, unsigned long *num, out_dgt(info, dgt); } -#ifdef CONFIG_SPL_NET_SUPPORT +#ifdef CONFIG_SPL_NET static void string(struct printf_info *info, char *s) { char ch; @@ -177,7 +177,7 @@ static void __maybe_unused pointer(struct printf_info *info, const char *fmt, } break; #endif -#ifdef CONFIG_SPL_NET_SUPPORT +#ifdef CONFIG_SPL_NET case 'm': return mac_address_string(info, ptr, false); case 'M': diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 314b02ba07..768eaaf8f5 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -96,7 +96,7 @@ libs-$(CONFIG_SPL_USB_GADGET) += drivers/usb/cdns3/ libs-y += dts/ libs-y += fs/ libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/ -libs-$(CONFIG_SPL_NET_SUPPORT) += net/ +libs-$(CONFIG_SPL_NET) += net/ head-y := $(addprefix $(obj)/,$(head-y)) libs-y := $(addprefix $(obj)/,$(libs-y)) diff --git a/tools/buildman/README b/tools/buildman/README index c1ac0d0f58..3764344fa7 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -983,13 +983,13 @@ For example: ... 43: Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig arm: - + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET=1 + u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 - + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET=1 am335x_evm_usbspl : - + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET=1 + u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 - + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET=1 44: Convert CONFIG_SPL_USB_HOST_SUPPORT to Kconfig ... 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: 1230199 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nathanrossi.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi.com header.i=@nathanrossi.com header.a=rsa-sha256 header.s=google header.b=C+fW88ui; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 486KFg2M8Wz9sP3 for ; Tue, 28 Jan 2020 19:16:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D73AF81946; Tue, 28 Jan 2020 09:16:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=nathanrossi.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi.com header.i=@nathanrossi.com header.b="C+fW88ui"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96C248190B; Tue, 28 Jan 2020 09:16:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2BA918188C for ; Tue, 28 Jan 2020 09:16:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nathanrossi.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=nathan@nathanrossi.com Received: by mail-pj1-x1044.google.com with SMTP id 12so663347pjb.5 for ; Tue, 28 Jan 2020 00:16:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nathanrossi.com; s=google; h=date:message-id:in-reply-to:references:from:to:cc:subject :content-transfer-encoding:mime-version; bh=RUw1R/zqOnplWSY/vLvc4dq3zAcnd8Avn8OudpYSeXU=; b=C+fW88uiihudAYpHn648A9R6PSm1NGD1JAizNuCWyZ/0Iq7hgi6FNnwuyw79C2Q4hs l39096W5/Bh4VVc7ofZplkJH414LNYJKrhoAAmJ+1vLRgMi/6fnPOluZy4gD22qer+j3 CCKrF3D83SFq+Fel91NaEGJJhQn1oZ7HZZIyIwW6QqiOQGQS7U2ewxCeiesLrmWZeRQg C3s7+WN/PWYnX4GF6ooSf6KiYqUQcBcnRRYubwU9p2ppIm7p0NpVg9Z6wLXotGpWk+Tq sM0y0kipIZFWtX15BXqDGeSWE8T/ijAXkHNO3SkEZvXtNs6xW+mMulZeF2QIjgvuLHAZ XAAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from:to :cc:subject:content-transfer-encoding:mime-version; bh=RUw1R/zqOnplWSY/vLvc4dq3zAcnd8Avn8OudpYSeXU=; b=ExPDnvU1Z1oWrTFwZh0s2FhRn+D2JqG4cxEAKZjDs0c/icDD7wHHfHbCRCQIAnwZg9 ZnutnSkU7FtlosKehEfLDjSdQ+FGh6n4wFWgqgsTLflTgd63JsRaXsJLnqfJCH73Mxzr JeWjkAdb6ehWBmyRK7ITMIfwdIKioRSapw9ozvKipVjhf+Jq/DvtqANj2bGdIeRuTWAt 1nIUjhjj5INE6ldibm7SDbQPi7oHCmlL1HQTcqskmIl0uYogPzMOeAASIxoMiUQ8jMee TTKNg94tW38x2G1CsYVHgZ35OU/dyV4+i+UZQuSmF0GmaCyIEW7wlWAkdvGF5WW6oR6Q Xulw== X-Gm-Message-State: APjAAAVOLJ2qsy+SAYl4mVLinXqxyjs9U8j+1OFUJ4Gel+w8C16sv5cF Tmuj268eZGdQF8w/x92Fb7rjlfyDK1c= X-Google-Smtp-Source: APXvYqx8PWoRzunNBNNguyiDQ63mPGdz0zhx/yyUrmHZtAV/xNFfPATA14tg3psDNspLU64Lv/E0Mg== X-Received: by 2002:a17:90a:30e8:: with SMTP id h95mr3437456pjb.30.1580199367295; Tue, 28 Jan 2020 00:16:07 -0800 (PST) Received: from [127.0.1.1] ([101.184.13.211]) by smtp.gmail.com with UTF8SMTPSA id r28sm18728371pgk.39.2020.01.28.00.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 00:16:06 -0800 (PST) Date: Tue, 28 Jan 2020 08:15:48 +0000 Message-Id: <20200128081548.458113-2-nathan@nathanrossi.com> In-Reply-To: <20200128081548.458113-1-nathan@nathanrossi.com> References: <20200128081548.458113-1-nathan@nathanrossi.com> From: Nathan Rossi To: u-boot@lists.denx.de Subject: [PATCH v2 2/2] net: Handle CONFIG_(SPL_)NET for conditional components MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joe Hershberger , Tom Rini Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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