Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Rename SPL_NET_SUPPORT to SPL_NET

Browse Source 
Rename this option so that CONFIG_IS_ENABLED can be used with it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-08-08 12:20:30 -06:00 committed by Tom Rini
parent a4faf1f563
commit 5ed16a9511
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile
View File

@ -69,7 +69,7 @@ endif
obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o
obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.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 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
ifdef CONFIG_SPL_USB_HOST ifdef CONFIG_SPL_USB_HOST

10
common/spl/Kconfig
View File

@ -590,7 +590,7 @@ config SPL_ETH
drivers in SPL. This permits SPL to load U-Boot over an Ethernet drivers in SPL. This permits SPL to load U-Boot over an Ethernet
link rather than from an on-board peripheral. Environment support link rather than from an on-board peripheral. Environment support
is required since the network stack uses a number of environment 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 config SPL_FS_EXT4
bool "Support EXT filesystems" bool "Support EXT filesystems"
@ -910,7 +910,7 @@ config UBI_SPL_SILENCE_MSG
endif # if SPL_UBI endif # if SPL_UBI
config SPL_NET_SUPPORT config SPL_NET
bool "Support networking" bool "Support networking"
help help
Enable support for network devices (such as Ethernet) in SPL. Enable support for network devices (such as Ethernet) in SPL.
@ -919,7 +919,7 @@ config SPL_NET_SUPPORT
the network stack uses a number of environment variables. See also the network stack uses a number of environment variables. See also
SPL_ETH. SPL_ETH.
if SPL_NET_SUPPORT if SPL_NET
config SPL_NET_VCI_STRING config SPL_NET_VCI_STRING
string "BOOTP Vendor Class Identifier string sent by SPL" string "BOOTP Vendor Class Identifier string sent by SPL"
help help
@ -928,7 +928,7 @@ config SPL_NET_VCI_STRING
of a client. This is often used in practice to allow for the DHCP 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, server to specify different files to load depending on if the ROM,
SPL or U-Boot itself makes the request SPL or U-Boot itself makes the request
endif # if SPL_NET_SUPPORT endif # if SPL_NET
config SPL_NO_CPU_SUPPORT config SPL_NO_CPU_SUPPORT
bool "Drop CPU code in SPL" bool "Drop CPU code in SPL"
@ -1222,7 +1222,7 @@ config SPL_USB_ETHER
USB-connected Ethernet link (such as a USB Ethernet dongle) rather USB-connected Ethernet link (such as a USB Ethernet dongle) rather
than from an onboard peripheral. Environment support is required than from an onboard peripheral. Environment support is required
since the network stack uses a number of environment variables. since the network stack uses a number of environment variables.
See also SPL_NET_SUPPORT and SPL_ETH. See also SPL_NET and SPL_ETH.
config SPL_DFU config SPL_DFU
bool "Support DFU (Device Firmware Upgrade)" bool "Support DFU (Device Firmware Upgrade)"

2
common/spl/Makefile
View File

@ -19,7 +19,7 @@ obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += spl_nand.o
obj-$(CONFIG_$(SPL_TPL_)ONENAND_SUPPORT) += spl_onenand.o obj-$(CONFIG_$(SPL_TPL_)ONENAND_SUPPORT) += spl_onenand.o
endif endif
obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o 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) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)MMC) += spl_mmc.o
obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o
obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o

2
configs/am335x_boneblack_vboot_defconfig
View File

@ -21,7 +21,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_ARCH_MISC_INIT=y CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_MUSB_NEW=y CONFIG_SPL_MUSB_NEW=y
# CONFIG_SPL_NAND_SUPPORT is not set # 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_NET_VCI_STRING="AM33xx U-Boot SPL"
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_GADGET=y

2
configs/am335x_evm_defconfig
View File

@ -21,7 +21,7 @@ CONFIG_SPL_MUSB_NEW=y
CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_DRIVERS=y
CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_GADGET=y

2
configs/am335x_guardian_defconfig
View File

@ -35,7 +35,7 @@ CONFIG_SPL_MUSB_NEW=y
CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_DRIVERS=y
CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_NET_VCI_STRING="Guardian U-Boot SPL" CONFIG_SPL_NET_VCI_STRING="Guardian U-Boot SPL"
CONFIG_SPL_POWER=y CONFIG_SPL_POWER=y
CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_GADGET=y

2
configs/am335x_sl50_defconfig
View File

@ -29,7 +29,7 @@ CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_DRIVERS=y
CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_POWER=y CONFIG_SPL_POWER=y

2
configs/am43xx_evm_defconfig
View File

@ -21,7 +21,7 @@ CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_DRIVERS=y
CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_USB_HOST=y CONFIG_SPL_USB_HOST=y

2
configs/am43xx_hs_evm_defconfig
View File

@ -30,7 +30,7 @@ CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_DRIVERS=y
CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
CONFIG_SPL_USB_HOST=y CONFIG_SPL_USB_HOST=y
CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_GADGET=y

2
configs/chromebook_link64_defconfig
View File

@ -35,7 +35,7 @@ CONFIG_SPL_CPU=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_I2C=y CONFIG_SPL_I2C=y
CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_PCI=y CONFIG_SPL_PCI=y
CONFIG_SPL_PCH=y CONFIG_SPL_PCH=y
CONFIG_SPL_RTC=y CONFIG_SPL_RTC=y

2
configs/chromebook_samus_tpl_defconfig
View File

@ -34,7 +34,7 @@ CONFIG_BLOBLIST_ADDR=0xff7c0000
CONFIG_HANDOFF=y CONFIG_HANDOFF=y
CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_PCI=y CONFIG_SPL_PCI=y
CONFIG_SPL_PCH=y CONFIG_SPL_PCH=y
CONFIG_TPL_PCI=y CONFIG_TPL_PCI=y

2
configs/qemu-x86_64_defconfig
View File

@ -34,7 +34,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_CPU=y CONFIG_SPL_CPU=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET=y
CONFIG_SPL_PCI=y CONFIG_SPL_PCI=y
CONFIG_SPL_PCH=y CONFIG_SPL_PCH=y
CONFIG_SPL_RTC=y CONFIG_SPL_RTC=y

2
doc/SPL/README.am335x-network
View File

@ -7,7 +7,7 @@ NAND and bricked (empty) board with only a network cable.
I. Building the required images I. Building the required images
1. You have to enable generic SPL configuration options (see 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_SPL_ETH, CONFIG_SPL_LIBGENERIC_SUPPORT and CONFIG_SPL_ETH, CONFIG_SPL_LIBGENERIC_SUPPORT and
CONFIG_SPL_LIBCOMMON_SUPPORT in your board configuration file to build CONFIG_SPL_LIBCOMMON_SUPPORT in your board configuration file to build
SPL with support for booting over the network. Also you have to enable SPL with support for booting over the network. Also you have to enable

6
lib/tiny-printf.c
View File

@ -48,7 +48,7 @@ static void div_out(struct printf_info *info, unsigned long *num,
out_dgt(info, dgt); out_dgt(info, dgt);
} }
#ifdef CONFIG_SPL_NET_SUPPORT #ifdef CONFIG_SPL_NET
static void string(struct printf_info *info, char *s) static void string(struct printf_info *info, char *s)
{ {
char ch; char ch;
@ -178,7 +178,7 @@ static void __maybe_unused pointer(struct printf_info *info, const char *fmt,
} }
break; break;
#endif #endif
#ifdef CONFIG_SPL_NET_SUPPORT #ifdef CONFIG_SPL_NET
case 'm': case 'm':
return mac_address_string(info, ptr, false); return mac_address_string(info, ptr, false);
case 'M': case 'M':
@ -270,7 +270,7 @@ static int _vprintf(struct printf_info *info, const char *fmt, va_list va)
} }
break; break;
case 'p': case 'p':
if (CONFIG_IS_ENABLED(NET_SUPPORT) || _DEBUG) { if (CONFIG_IS_ENABLED(NET) || _DEBUG) {
pointer(info, fmt, va_arg(va, void *)); pointer(info, fmt, va_arg(va, void *));
/* /*
* Skip this because it pulls in _ctype which is * Skip this because it pulls in _ctype which is

2
scripts/Makefile.spl
View File

@ -108,7 +108,7 @@ libs-$(CONFIG_SPL_USB_GADGET) += drivers/usb/cdns3/
libs-y += dts/ libs-y += dts/
libs-y += fs/ libs-y += fs/
libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/ libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/
libs-$(CONFIG_SPL_NET_SUPPORT) += net/ libs-$(CONFIG_SPL_NET) += net/
libs-$(CONFIG_SPL_UNIT_TEST) += test/ libs-$(CONFIG_SPL_UNIT_TEST) += test/
head-y := $(addprefix $(obj)/,$(head-y)) head-y := $(addprefix $(obj)/,$(head-y))

8
tools/buildman/README
View File

@ -1010,13 +1010,13 @@ For example:
... ...
43: Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig 43: Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig
arm: 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=1 CONFIG_SPL_NAND_SUPPORT=1 + u-boot-spl.cfg: CONFIG_SPL_MMC=1 CONFIG_SPL_NAND_SUPPORT=1
+ all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET=1
am335x_evm_usbspl : 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=1 CONFIG_SPL_NAND_SUPPORT=1 + u-boot-spl.cfg: CONFIG_SPL_MMC=1 CONFIG_SPL_NAND_SUPPORT=1
+ all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET=1
44: Convert CONFIG_SPL_USB_HOST to Kconfig 44: Convert CONFIG_SPL_USB_HOST to Kconfig
... ...