Rename SPL_ETH_SUPPORT to SPL_ETH
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:
parent
0c6bdbb97c
commit
f2d7a36ec2
@ -104,7 +104,7 @@ void save_omap_boot_params(void)
|
||||
sys_boot_device = 1;
|
||||
break;
|
||||
#endif
|
||||
#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH_SUPPORT)
|
||||
#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH)
|
||||
case BOOT_DEVICE_CPGMAC:
|
||||
sys_boot_device = 1;
|
||||
break;
|
||||
|
@ -288,7 +288,7 @@ int board_late_init(void)
|
||||
#endif
|
||||
|
||||
#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)
|
||||
{
|
||||
/* VTP can be added here */
|
||||
|
@ -171,7 +171,7 @@ int read_eeprom(void)
|
||||
}
|
||||
|
||||
#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)
|
||||
{
|
||||
/* VTP can be added here */
|
||||
@ -220,7 +220,7 @@ int board_eth_init(struct bd_info *bis)
|
||||
{
|
||||
int n = 0;
|
||||
#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;
|
||||
#ifdef CONFIG_FACTORYSET
|
||||
int rv;
|
||||
|
@ -250,7 +250,7 @@ int board_late_init(void)
|
||||
#endif
|
||||
|
||||
#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)
|
||||
{
|
||||
/* 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
|
||||
* 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_DRIVER_TI_CPSW) || \
|
||||
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;
|
||||
|
||||
#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")) {
|
||||
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
|
||||
|
||||
|
@ -588,7 +588,7 @@ void sdram_init(void)
|
||||
#endif
|
||||
|
||||
#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)
|
||||
{
|
||||
int ret;
|
||||
@ -724,7 +724,7 @@ int board_init(void)
|
||||
#endif
|
||||
|
||||
#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()) {
|
||||
int rv;
|
||||
u32 reg;
|
||||
|
@ -379,7 +379,7 @@ int board_late_init(void)
|
||||
#endif
|
||||
|
||||
#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)
|
||||
{
|
||||
/* VTP can be added here */
|
||||
@ -421,7 +421,7 @@ static struct cpsw_platform_data cpsw_data = {
|
||||
};
|
||||
#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_DRIVER_TI_CPSW) || \
|
||||
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;
|
||||
|
||||
#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")) {
|
||||
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
|
||||
|
||||
|
@ -582,7 +582,7 @@ config SPL_SAVEENV
|
||||
"reboot_image" and act accordingly and change the reboot_image
|
||||
to default mode using setenv and save the environment.
|
||||
|
||||
config SPL_ETH_SUPPORT
|
||||
config SPL_ETH
|
||||
bool "Support Ethernet"
|
||||
depends on SPL_ENV_SUPPORT
|
||||
help
|
||||
@ -926,7 +926,7 @@ config SPL_NET_SUPPORT
|
||||
This permits SPL to load U-Boot over a network 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_ETH_SUPPORT.
|
||||
SPL_ETH.
|
||||
|
||||
if SPL_NET_SUPPORT
|
||||
config SPL_NET_VCI_STRING
|
||||
@ -1229,7 +1229,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_SUPPORT and SPL_ETH.
|
||||
|
||||
config SPL_DFU
|
||||
bool "Support DFU (Device Firmware Upgrade)"
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <net.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,
|
||||
ulong count, void *buf)
|
||||
{
|
||||
@ -69,7 +69,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SPL_ETH_SUPPORT
|
||||
#ifdef CONFIG_SPL_ETH
|
||||
int spl_net_load_image_cpgmac(struct spl_image_info *spl_image,
|
||||
struct spl_boot_device *bootdev)
|
||||
{
|
||||
|
@ -14,7 +14,7 @@ CONFIG_LOGLEVEL=3
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
CONFIG_ARCH_MISC_INIT=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_MTD_SUPPORT=y
|
||||
CONFIG_SPL_MUSB_NEW_SUPPORT=y
|
||||
|
@ -29,7 +29,7 @@ CONFIG_ARCH_MISC_INIT=y
|
||||
CONFIG_SPL_SEPARATE_BSS=y
|
||||
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
|
||||
CONFIG_SPL_ENV_SUPPORT=y
|
||||
CONFIG_SPL_ETH_SUPPORT=y
|
||||
CONFIG_SPL_ETH=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
CONFIG_SPL_MUSB_NEW_SUPPORT=y
|
||||
CONFIG_SPL_NAND_DRIVERS=y
|
||||
|
@ -15,7 +15,7 @@ CONFIG_SPL_LOAD_FIT=y
|
||||
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_MISC_INIT_R is not set
|
||||
CONFIG_SPL_ETH_SUPPORT=y
|
||||
CONFIG_SPL_ETH=y
|
||||
CONFIG_SPL_MTD_SUPPORT=y
|
||||
CONFIG_SPL_NAND_DRIVERS=y
|
||||
CONFIG_SPL_NAND_ECC=y
|
||||
|
@ -24,7 +24,7 @@ CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_MISC_INIT_R is not set
|
||||
CONFIG_SPL_ETH_SUPPORT=y
|
||||
CONFIG_SPL_ETH=y
|
||||
CONFIG_SPL_MTD_SUPPORT=y
|
||||
CONFIG_SPL_NAND_DRIVERS=y
|
||||
CONFIG_SPL_NAND_ECC=y
|
||||
|
@ -8,7 +8,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,
|
||||
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
|
||||
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
|
||||
|
@ -50,8 +50,8 @@ obj-$(CONFIG_SPL_POWER) += power/regulator/
|
||||
obj-$(CONFIG_SPL_POWER_DOMAIN) += power/domain/
|
||||
obj-$(CONFIG_SPL_DM_RESET) += reset/
|
||||
obj-$(CONFIG_SPL_DMA) += dma/
|
||||
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/
|
||||
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/
|
||||
obj-$(CONFIG_SPL_ETH) += net/
|
||||
obj-$(CONFIG_SPL_ETH) += net/phy/
|
||||
obj-$(CONFIG_SPL_USB_ETHER) += net/phy/
|
||||
obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/
|
||||
obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/
|
||||
|
@ -17,7 +17,7 @@
|
||||
/* Fixup settings */
|
||||
|
||||
/* SPL settings */
|
||||
#undef CONFIG_SPL_ETH_SUPPORT
|
||||
#undef CONFIG_SPL_ETH
|
||||
#undef CONFIG_SPL_MAX_FOOTPRINT
|
||||
#define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS
|
||||
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||
|
Loading…
Reference in New Issue
Block a user