From b432b1ebdf3422caa3b714ef5a417a4e8864fad6 Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Fri, 16 Feb 2018 21:17:44 +0530 Subject: spl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot CONFIG Rename CONFIG_SPL_USBETH_SUPPORT to CONFIG_SPL_USB_ETHER. This enables users to block text using CONFIG_IS_ENABLED() instead of resorting to #if ladders with SPL and non-SPL cases. Signed-off-by: Faiz Abbas --- common/spl/Kconfig | 2 +- common/spl/spl_net.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f58163ce53..9609fceea5 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -680,7 +680,7 @@ config SPL_USB_GADGET_SUPPORT if SPL_USB_GADGET_SUPPORT -config SPL_USBETH_SUPPORT +config SPL_USB_ETHER bool "Support USB Ethernet drivers" help Enable access to the USB network subsystem and associated diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 88831097fa..ef13145eea 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -15,7 +15,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER) static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) { @@ -83,7 +83,7 @@ SPL_LOAD_IMAGE_METHOD("eth device", 0, BOOT_DEVICE_CPGMAC, spl_net_load_image_cpgmac); #endif -#ifdef CONFIG_SPL_USBETH_SUPPORT +#ifdef CONFIG_SPL_USB_ETHER int spl_net_load_image_usb(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { -- cgit v1.2.1