Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b432b1ebdf3422caa3b714ef5a417a4e8864fad6

Authored by Faiz Abbas
Committed by Tom Rini
1 parent cd655514aa
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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 <faiz_abbas@ti.com>

Showing 17 changed files with 22 additions and 22 deletions Side-by-side Diff

arch/arm/mach-omap2/boot-common.c
Diff comments   View file @ b432b1e
... ... @@ -99,7 +99,7 @@
99 99 sys_boot_device = 1;
100 100 break;
101 101 #endif
102   -#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT)
  102 +#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USB_ETHER)
103 103 case BOOT_DEVICE_USBETH:
104 104 sys_boot_device = 1;
105 105 break;
board/birdland/bav335x/board.c
Diff comments   View file @ b432b1e
... ... @@ -360,7 +360,7 @@
360 360 * Build in only these cases to avoid warnings about unused variables
361 361 * when we build an SPL that has neither option but full U-Boot will.
362 362 */
363   -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\
  363 +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) &&\
364 364 defined(CONFIG_SPL_BUILD)) || \
365 365 ((defined(CONFIG_DRIVER_TI_CPSW) || \
366 366 defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
board/bosch/shc/board.c
Diff comments   View file @ b432b1e
... ... @@ -522,7 +522,7 @@
522 522 * when we build an SPL that has neither option but full U-Boot will.
523 523 */
524 524 #if ((defined(CONFIG_SPL_ETH_SUPPORT) || \
525   - defined(CONFIG_SPL_USBETH_SUPPORT)) && \
  525 + defined(CONFIG_SPL_USB_ETHER)) && \
526 526 defined(CONFIG_SPL_BUILD)) || \
527 527 ((defined(CONFIG_DRIVER_TI_CPSW) || \
528 528 defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
... ... @@ -563,7 +563,7 @@
563 563 #endif
564 564  
565 565 #if defined(CONFIG_USB_ETHER) && \
566   - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
  566 + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
567 567 if (is_valid_ethaddr(mac_addr))
568 568 eth_env_set_enetaddr("usbnet_devaddr", mac_addr);
569 569  
board/tcl/sl50/board.c
Diff comments   View file @ b432b1e
... ... @@ -299,7 +299,7 @@
299 299 * Build in only these cases to avoid warnings about unused variables
300 300 * when we build an SPL that has neither option but full U-Boot will.
301 301 */
302   -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \
  302 +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \
303 303 && defined(CONFIG_SPL_BUILD)) || \
304 304 ((defined(CONFIG_DRIVER_TI_CPSW) || \
305 305 defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
... ... @@ -371,7 +371,7 @@
371 371  
372 372 #endif
373 373 #if defined(CONFIG_USB_ETHER) && \
374   - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
  374 + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
375 375 if (is_valid_ether_addr(mac_addr))
376 376 eth_env_set_enetaddr("usbnet_devaddr", mac_addr);
377 377  
board/ti/am335x/board.c
Diff comments   View file @ b432b1e
... ... @@ -815,7 +815,7 @@
815 815 };
816 816 #endif
817 817  
818   -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\
  818 +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) &&\
819 819 defined(CONFIG_SPL_BUILD)) || \
820 820 ((defined(CONFIG_DRIVER_TI_CPSW) || \
821 821 defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
... ... @@ -836,7 +836,7 @@
836 836 {
837 837 int rv, n = 0;
838 838 #if defined(CONFIG_USB_ETHER) && \
839   - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
  839 + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
840 840 uint8_t mac_addr[6];
841 841 uint32_t mac_hi, mac_lo;
842 842  
... ... @@ -906,7 +906,7 @@
906 906 }
907 907 #endif
908 908 #if defined(CONFIG_USB_ETHER) && \
909   - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
  909 + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
910 910 if (is_valid_ethaddr(mac_addr))
911 911 eth_env_set_enetaddr("usbnet_devaddr", mac_addr);
912 912  
board/vscom/baltos/board.c
Diff comments   View file @ b432b1e
... ... @@ -423,7 +423,7 @@
423 423 };
424 424 #endif
425 425  
426   -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \
  426 +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \
427 427 && defined(CONFIG_SPL_BUILD)) || \
428 428 ((defined(CONFIG_DRIVER_TI_CPSW) || \
429 429 defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
... ... @@ -680,7 +680,7 @@
680 680  
681 681 if SPL_USB_GADGET_SUPPORT
682 682  
683   -config SPL_USBETH_SUPPORT
  683 +config SPL_USB_ETHER
684 684 bool "Support USB Ethernet drivers"
685 685 help
686 686 Enable access to the USB network subsystem and associated
common/spl/spl_net.c
Diff comments   View file @ b432b1e
... ... @@ -15,7 +15,7 @@
15 15  
16 16 DECLARE_GLOBAL_DATA_PTR;
17 17  
18   -#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
  18 +#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)
19 19 static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
20 20 ulong count, void *buf)
21 21 {
... ... @@ -83,7 +83,7 @@
83 83 spl_net_load_image_cpgmac);
84 84 #endif
85 85  
86   -#ifdef CONFIG_SPL_USBETH_SUPPORT
  86 +#ifdef CONFIG_SPL_USB_ETHER
87 87 int spl_net_load_image_usb(struct spl_image_info *spl_image,
88 88 struct spl_boot_device *bootdev)
89 89 {
configs/am335x_evm_usbspl_defconfig
Diff comments   View file @ b432b1e
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
16 16 CONFIG_SPL_OS_BOOT=y
17 17 CONFIG_SPL_USB_GADGET_SUPPORT=y
18   -CONFIG_SPL_USBETH_SUPPORT=y
  18 +CONFIG_SPL_USB_ETHER=y
19 19 # CONFIG_SPL_YMODEM_SUPPORT is not set
20 20 CONFIG_FASTBOOT=y
21 21 CONFIG_CMD_SPL=y
configs/am43xx_hs_evm_defconfig
Diff comments   View file @ b432b1e
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_USB_HOST_SUPPORT=y
27 27 CONFIG_SPL_USB_SUPPORT=y
28 28 CONFIG_SPL_USB_GADGET_SUPPORT=y
29   -CONFIG_SPL_USBETH_SUPPORT=y
  29 +CONFIG_SPL_USB_ETHER=y
30 30 # CONFIG_CMD_FLASH is not set
31 31 CONFIG_CMD_NAND=y
32 32 # CONFIG_CMD_SETEXPR is not set
configs/mx6memcal_defconfig
Diff comments   View file @ b432b1e
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_SPL=y
13 13 CONFIG_SPL_USB_HOST_SUPPORT=y
14 14 CONFIG_SPL_USB_GADGET_SUPPORT=y
15   -CONFIG_SPL_USBETH_SUPPORT=y
  15 +CONFIG_SPL_USB_ETHER=y
16 16 CONFIG_SPL_USB_SDP_SUPPORT=y
17 17 CONFIG_HUSH_PARSER=y
18 18 # CONFIG_CMD_BOOTD is not set
... ... @@ -35,7 +35,7 @@
35 35 obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/
36 36 obj-$(CONFIG_SPL_ETH_SUPPORT) += net/
37 37 obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/
38   -obj-$(CONFIG_SPL_USBETH_SUPPORT) += net/phy/
  38 +obj-$(CONFIG_SPL_USB_ETHER) += net/phy/
39 39 obj-$(CONFIG_SPL_PCI_SUPPORT) += pci/
40 40 obj-$(CONFIG_SPL_PCH_SUPPORT) += pch/
41 41 obj-$(CONFIG_SPL_RTC_SUPPORT) += rtc/
include/configs/am335x_evm.h
Diff comments   View file @ b432b1e
... ... @@ -242,7 +242,7 @@
242 242 #undef CONFIG_DM_USB
243 243 #endif
244 244  
245   -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
  245 +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
246 246 /* Remove other SPL modes. */
247 247 /* disable host part of MUSB in SPL */
248 248 /* disable EFI partitions and partition UUID support */
include/configs/am335x_sl50.h
Diff comments   View file @ b432b1e
... ... @@ -74,7 +74,7 @@
74 74 /* Bootcount using the RTC block */
75 75 #define CONFIG_SYS_BOOTCOUNT_BE
76 76  
77   -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
  77 +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
78 78 /* Remove other SPL modes. */
79 79 /* disable host part of MUSB in SPL */
80 80 #undef CONFIG_MUSB_HOST
include/configs/am43xx_evm.h
Diff comments   View file @ b432b1e
... ... @@ -80,7 +80,7 @@
80 80 #define CONFIG_AM437X_USB2PHY2_HOST
81 81 #endif
82 82  
83   -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
  83 +#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_ETHER)
84 84 #undef CONFIG_USB_DWC3_PHY_OMAP
85 85 #undef CONFIG_USB_DWC3_OMAP
86 86 #undef CONFIG_USB_DWC3
include/configs/baltos.h
Diff comments   View file @ b432b1e
... ... @@ -273,7 +273,7 @@
273 273 #define CONFIG_AM335X_USB1
274 274 #define CONFIG_AM335X_USB1_MODE MUSB_OTG
275 275  
276   -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
  276 +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
277 277 /* disable host part of MUSB in SPL */
278 278 /* disable EFI partitions and partition UUID support */
279 279 /*
include/configs/bav335x.h
Diff comments   View file @ b432b1e
... ... @@ -395,7 +395,7 @@
395 395 #define CONFIG_AM335X_USB1
396 396 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
397 397  
398   -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
  398 +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
399 399 /* disable host part of MUSB in SPL */
400 400 /* disable EFI partitions and partition UUID support */
401 401 #endif