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

Rename SPL_ETH_SUPPORT to SPL_ETH

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-07-10 21:14:26 -06:00 committed by Tom Rini
parent 0c6bdbb97c
commit f2d7a36ec2
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/boot-common.c
View File

@ -104,7 +104,7 @@ void save_omap_boot_params(void)
sys_boot_device = 1; sys_boot_device = 1;
break; break;
#endif #endif
#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH_SUPPORT) #if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH)
case BOOT_DEVICE_CPGMAC: case BOOT_DEVICE_CPGMAC:
sys_boot_device = 1; sys_boot_device = 1;
break; break;

2
board/siemens/draco/board.c
View File

@ -288,7 +288,7 @@ int board_late_init(void)
#endif #endif
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */

4
board/siemens/pxm2/board.c
View File

@ -171,7 +171,7 @@ int read_eeprom(void)
} }
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */
@ -220,7 +220,7 @@ int board_eth_init(struct bd_info *bis)
{ {
int n = 0; int n = 0;
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
#ifdef CONFIG_FACTORYSET #ifdef CONFIG_FACTORYSET
int rv; int rv;

6
board/tcl/sl50/board.c
View File

@ -250,7 +250,7 @@ int board_late_init(void)
#endif #endif
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */
@ -302,7 +302,7 @@ static struct cpsw_platform_data cpsw_data = {
* Build in only these cases to avoid warnings about unused variables * Build in only these cases to avoid warnings about unused variables
* when we build an SPL that has neither option but full U-Boot will. * when we build an SPL that has neither option but full U-Boot will.
*/ */
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ #if ((defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)) \
&& defined(CONFIG_SPL_BUILD)) || \ && defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \
defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
@ -324,7 +324,7 @@ int board_eth_init(struct bd_info *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8; mac_addr[5] = (mac_lo & 0xFF00) >> 8;
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
if (!env_get("ethaddr")) { if (!env_get("ethaddr")) {
printf("<ethaddr> not set. Validating first E-fuse MAC\n"); printf("<ethaddr> not set. Validating first E-fuse MAC\n");

4
board/ti/am335x/board.c
View File

@ -588,7 +588,7 @@ void sdram_init(void)
#endif #endif
#if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \ #if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD)))
static void request_and_set_gpio(int gpio, char *name, int val) static void request_and_set_gpio(int gpio, char *name, int val)
{ {
int ret; int ret;
@ -724,7 +724,7 @@ int board_init(void)
#endif #endif
#if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \ #if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD)))
if (board_is_icev2()) { if (board_is_icev2()) {
int rv; int rv;
u32 reg; u32 reg;

6
board/vscom/baltos/board.c
View File

@ -379,7 +379,7 @@ int board_late_init(void)
#endif #endif
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
static void cpsw_control(int enabled) static void cpsw_control(int enabled)
{ {
/* VTP can be added here */ /* VTP can be added here */
@ -421,7 +421,7 @@ static struct cpsw_platform_data cpsw_data = {
}; };
#endif #endif
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ #if ((defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)) \
&& defined(CONFIG_SPL_BUILD)) || \ && defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \
defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
@ -450,7 +450,7 @@ int board_eth_init(struct bd_info *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8; mac_addr[5] = (mac_lo & 0xFF00) >> 8;
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
if (!env_get("ethaddr")) { if (!env_get("ethaddr")) {
printf("<ethaddr> not set. Validating first E-fuse MAC\n"); printf("<ethaddr> not set. Validating first E-fuse MAC\n");

6
common/spl/Kconfig
View File

@ -582,7 +582,7 @@ config SPL_SAVEENV
"reboot_image" and act accordingly and change the reboot_image "reboot_image" and act accordingly and change the reboot_image
to default mode using setenv and save the environment. to default mode using setenv and save the environment.
config SPL_ETH_SUPPORT config SPL_ETH
bool "Support Ethernet" bool "Support Ethernet"
depends on SPL_ENV_SUPPORT depends on SPL_ENV_SUPPORT
help help
@ -926,7 +926,7 @@ config SPL_NET_SUPPORT
This permits SPL to load U-Boot over a network link rather than This permits SPL to load U-Boot over a network link rather than
from an on-board peripheral. Environment support is required since from an on-board peripheral. Environment support is required since
the network stack uses a number of environment variables. See also the network stack uses a number of environment variables. See also
SPL_ETH_SUPPORT. SPL_ETH.
if SPL_NET_SUPPORT if SPL_NET_SUPPORT
config SPL_NET_VCI_STRING config SPL_NET_VCI_STRING
@ -1229,7 +1229,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_SUPPORT. See also SPL_NET_SUPPORT and SPL_ETH.
config SPL_DFU config SPL_DFU
bool "Support DFU (Device Firmware Upgrade)" bool "Support DFU (Device Firmware Upgrade)"

4
common/spl/spl_net.c
View File

@ -15,7 +15,7 @@
#include <net.h> #include <net.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER) #if defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)
static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf) ulong count, void *buf)
{ {
@ -69,7 +69,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
} }
#endif #endif
#ifdef CONFIG_SPL_ETH_SUPPORT #ifdef CONFIG_SPL_ETH
int spl_net_load_image_cpgmac(struct spl_image_info *spl_image, int spl_net_load_image_cpgmac(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {

2
configs/am335x_evm_defconfig
View File

@ -14,7 +14,7 @@ CONFIG_LOGLEVEL=3
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_ARCH_MISC_INIT=y CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_FIT_IMAGE_TINY=y
CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_ETH=y
# CONFIG_SPL_FS_EXT4 is not set # CONFIG_SPL_FS_EXT4 is not set
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y

2
configs/am335x_guardian_defconfig
View File

@ -29,7 +29,7 @@ CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_SEPARATE_BSS=y
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_ETH=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_DRIVERS=y

2
configs/am43xx_evm_defconfig
View File

@ -15,7 +15,7 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_MISC_INIT_R is not set # CONFIG_MISC_INIT_R is not set
CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_ETH=y
CONFIG_SPL_MTD_SUPPORT=y 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

2
configs/am43xx_hs_evm_defconfig
View File

@ -24,7 +24,7 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_MISC_INIT_R is not set # CONFIG_MISC_INIT_R is not set
CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_ETH=y
CONFIG_SPL_MTD_SUPPORT=y 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

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

@ -8,7 +8,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_SUPPORT,
CONFIG_ETH_SUPPORT, 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
the driver for the NIC used and CONFIG_SPL_BOARD_INIT option if your the driver for the NIC used and CONFIG_SPL_BOARD_INIT option if your

4
drivers/Makefile
View File

@ -50,8 +50,8 @@ obj-$(CONFIG_SPL_POWER) += power/regulator/
obj-$(CONFIG_SPL_POWER_DOMAIN) += power/domain/ obj-$(CONFIG_SPL_POWER_DOMAIN) += power/domain/
obj-$(CONFIG_SPL_DM_RESET) += reset/ obj-$(CONFIG_SPL_DM_RESET) += reset/
obj-$(CONFIG_SPL_DMA) += dma/ obj-$(CONFIG_SPL_DMA) += dma/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/ obj-$(CONFIG_SPL_ETH) += net/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/ obj-$(CONFIG_SPL_ETH) += net/phy/
obj-$(CONFIG_SPL_USB_ETHER) += net/phy/ obj-$(CONFIG_SPL_USB_ETHER) += net/phy/
obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/ obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/
obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/

2
include/configs/topic_miami.h
View File

@ -17,7 +17,7 @@
/* Fixup settings */ /* Fixup settings */
/* SPL settings */ /* SPL settings */
#undef CONFIG_SPL_ETH_SUPPORT #undef CONFIG_SPL_ETH
#undef CONFIG_SPL_MAX_FOOTPRINT #undef CONFIG_SPL_MAX_FOOTPRINT
#define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS #define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"