Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot CONFIG

Browse Source 
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 <faiz_abbas@ti.com>
master
Faiz Abbas 6 years ago committed by Tom Rini
parent cd655514aa
commit b432b1ebdf
17 changed files with 22 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/mach-omap2/boot-common.c
  2. 2
      board/birdland/bav335x/board.c
  3. 4
      board/bosch/shc/board.c
  4. 4
      board/tcl/sl50/board.c
  5. 6
      board/ti/am335x/board.c
  6. 2
      board/vscom/baltos/board.c
  7. 2
      common/spl/Kconfig
  8. 4
      common/spl/spl_net.c
  9. 2
      configs/am335x_evm_usbspl_defconfig
  10. 2
      configs/am43xx_hs_evm_defconfig
  11. 2
      configs/mx6memcal_defconfig
  12. 2
      drivers/Makefile
  13. 2
      include/configs/am335x_evm.h
  14. 2
      include/configs/am335x_sl50.h
  15. 2
      include/configs/am43xx_evm.h
  16. 2
      include/configs/baltos.h
  17. 2
      include/configs/bav335x.h

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

@ -99,7 +99,7 @@ void save_omap_boot_params(void)
sys_boot_device = 1; sys_boot_device = 1;
break; break;
#endif #endif
#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USB_ETHER)
case BOOT_DEVICE_USBETH: case BOOT_DEVICE_USBETH:
sys_boot_device = 1; sys_boot_device = 1;
break; break;

2
board/birdland/bav335x/board.c
Unescape View File

@ -360,7 +360,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_USBETH_SUPPORT)) &&\ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || 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)) && \

4
board/bosch/shc/board.c
Unescape View File

@ -522,7 +522,7 @@ static struct cpsw_platform_data cpsw_data = {
* 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) || \ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || \
defined(CONFIG_SPL_USBETH_SUPPORT)) && \ 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)) && \
@ -563,7 +563,7 @@ int board_eth_init(bd_t *bis)
#endif #endif
#if defined(CONFIG_USB_ETHER) && \ #if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
if (is_valid_ethaddr(mac_addr)) if (is_valid_ethaddr(mac_addr))
eth_env_set_enetaddr("usbnet_devaddr", mac_addr); eth_env_set_enetaddr("usbnet_devaddr", mac_addr);

4
board/tcl/sl50/board.c
Unescape View File

@ -299,7 +299,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_USBETH_SUPPORT)) \ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || 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)) && \
@ -371,7 +371,7 @@ int board_eth_init(bd_t *bis)
#endif #endif
#if defined(CONFIG_USB_ETHER) && \ #if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
if (is_valid_ether_addr(mac_addr)) if (is_valid_ether_addr(mac_addr))
eth_env_set_enetaddr("usbnet_devaddr", mac_addr); eth_env_set_enetaddr("usbnet_devaddr", mac_addr);

6
board/ti/am335x/board.c
Unescape View File

@ -815,7 +815,7 @@ static struct cpsw_platform_data cpsw_data = {
}; };
#endif #endif
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || 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)) && \
@ -836,7 +836,7 @@ int board_eth_init(bd_t *bis)
{ {
int rv, n = 0; int rv, n = 0;
#if defined(CONFIG_USB_ETHER) && \ #if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
uint8_t mac_addr[6]; uint8_t mac_addr[6];
uint32_t mac_hi, mac_lo; uint32_t mac_hi, mac_lo;
@ -906,7 +906,7 @@ int board_eth_init(bd_t *bis)
} }
#endif #endif
#if defined(CONFIG_USB_ETHER) && \ #if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
if (is_valid_ethaddr(mac_addr)) if (is_valid_ethaddr(mac_addr))
eth_env_set_enetaddr("usbnet_devaddr", mac_addr); eth_env_set_enetaddr("usbnet_devaddr", mac_addr);

2
board/vscom/baltos/board.c
Unescape View File

@ -423,7 +423,7 @@ static struct cpsw_platform_data cpsw_data = {
}; };
#endif #endif
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || 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)) && \

2
common/spl/Kconfig
Unescape View File

@ -680,7 +680,7 @@ config SPL_USB_GADGET_SUPPORT
if SPL_USB_GADGET_SUPPORT if SPL_USB_GADGET_SUPPORT
config SPL_USBETH_SUPPORT config SPL_USB_ETHER
bool "Support USB Ethernet drivers" bool "Support USB Ethernet drivers"
help help
Enable access to the USB network subsystem and associated Enable access to the USB network subsystem and associated

4
common/spl/spl_net.c
Unescape View File

@ -15,7 +15,7 @@
DECLARE_GLOBAL_DATA_PTR; 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, static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf) ulong count, void *buf)
{ {
@ -83,7 +83,7 @@ SPL_LOAD_IMAGE_METHOD("eth device", 0, BOOT_DEVICE_CPGMAC,
spl_net_load_image_cpgmac); spl_net_load_image_cpgmac);
#endif #endif
#ifdef CONFIG_SPL_USBETH_SUPPORT #ifdef CONFIG_SPL_USB_ETHER
int spl_net_load_image_usb(struct spl_image_info *spl_image, int spl_net_load_image_usb(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {

2
configs/am335x_evm_usbspl_defconfig
Unescape View File

@ -15,7 +15,7 @@ CONFIG_SPL_NET_SUPPORT=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_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USBETH_SUPPORT=y CONFIG_SPL_USB_ETHER=y
# CONFIG_SPL_YMODEM_SUPPORT is not set # CONFIG_SPL_YMODEM_SUPPORT is not set
CONFIG_FASTBOOT=y CONFIG_FASTBOOT=y
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y

2
configs/am43xx_hs_evm_defconfig
Unescape View File

@ -26,7 +26,7 @@ CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y
CONFIG_SPL_USB_SUPPORT=y CONFIG_SPL_USB_SUPPORT=y
CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USBETH_SUPPORT=y CONFIG_SPL_USB_ETHER=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set

2
configs/mx6memcal_defconfig
Unescape View File

@ -12,7 +12,7 @@ CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y
CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USBETH_SUPPORT=y CONFIG_SPL_USB_ETHER=y
CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTD is not set

2
drivers/Makefile
Unescape View File

@ -35,7 +35,7 @@ obj-$(CONFIG_SPL_UBI) += mtd/ubispl/
obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/ obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/
obj-$(CONFIG_SPL_USBETH_SUPPORT) += net/phy/ obj-$(CONFIG_SPL_USB_ETHER) += net/phy/
obj-$(CONFIG_SPL_PCI_SUPPORT) += pci/ obj-$(CONFIG_SPL_PCI_SUPPORT) += pci/
obj-$(CONFIG_SPL_PCH_SUPPORT) += pch/ obj-$(CONFIG_SPL_PCH_SUPPORT) += pch/
obj-$(CONFIG_SPL_RTC_SUPPORT) += rtc/ obj-$(CONFIG_SPL_RTC_SUPPORT) += rtc/

2
include/configs/am335x_evm.h
Unescape View File

@ -242,7 +242,7 @@
#undef CONFIG_DM_USB #undef CONFIG_DM_USB
#endif #endif
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
/* Remove other SPL modes. */ /* Remove other SPL modes. */
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */ /* disable EFI partitions and partition UUID support */

2
include/configs/am335x_sl50.h
Unescape View File

@ -74,7 +74,7 @@
/* Bootcount using the RTC block */ /* Bootcount using the RTC block */
#define CONFIG_SYS_BOOTCOUNT_BE #define CONFIG_SYS_BOOTCOUNT_BE
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
/* Remove other SPL modes. */ /* Remove other SPL modes. */
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST #undef CONFIG_MUSB_HOST

2
include/configs/am43xx_evm.h
Unescape View File

@ -80,7 +80,7 @@
#define CONFIG_AM437X_USB2PHY2_HOST #define CONFIG_AM437X_USB2PHY2_HOST
#endif #endif
#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_ETHER)
#undef CONFIG_USB_DWC3_PHY_OMAP #undef CONFIG_USB_DWC3_PHY_OMAP
#undef CONFIG_USB_DWC3_OMAP #undef CONFIG_USB_DWC3_OMAP
#undef CONFIG_USB_DWC3 #undef CONFIG_USB_DWC3

2
include/configs/baltos.h
Unescape View File

@ -273,7 +273,7 @@
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_OTG #define CONFIG_AM335X_USB1_MODE MUSB_OTG
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */ /* disable EFI partitions and partition UUID support */
/* /*

2
include/configs/bav335x.h
Unescape View File

@ -395,7 +395,7 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST #define CONFIG_AM335X_USB1_MODE MUSB_HOST
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
/* disable host part of MUSB in SPL */ /* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */ /* disable EFI partitions and partition UUID support */
#endif #endif

Write Preview
Loading…
Cancel
Save