diff options
author | Simon Glass <sjg@chromium.org> | 2021-07-10 21:14:26 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-28 14:27:54 -0400 |
commit | f2d7a36ec258f49eb80c9d4a0cc6cb7e697f5d6a (patch) | |
tree | 213b74e1c18e5589f8610f83fc4d41527fd03b16 /common | |
parent | 0c6bdbb97c5c7d233145de594325b9fbe1beb8bb (diff) | |
download | u-boot-f2d7a36ec258f49eb80c9d4a0cc6cb7e697f5d6a.zip u-boot-f2d7a36ec258f49eb80c9d4a0cc6cb7e697f5d6a.tar.gz u-boot-f2d7a36ec258f49eb80c9d4a0cc6cb7e697f5d6a.tar.bz2 |
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>
Diffstat (limited to 'common')
-rw-r--r-- | common/spl/Kconfig | 6 | ||||
-rw-r--r-- | common/spl/spl_net.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 4110835..6d44265 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -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)" diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index e140a63..d23b395 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -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) { |