Home Explore Help
Sign In
coolsoul
/
u-boot
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

configs: Re-sync CONFIG_USB_MUSB_HOST

Now that CONFIG_USB_MUSB_HOST is part of Kconfig, migrate that over to
the defconfig files.

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 9 years ago
parent
adad96e60d
commit
4d7100a61d
29 changed files with 23 additions and 12 deletions
Split View Show Diff Stats
  1. 1 0
      configs/am335x_baltos_defconfig
  2. 1 0
      configs/am335x_boneblack_defconfig
  3. 1 0
      configs/am335x_boneblack_vboot_defconfig
  4. 1 0
      configs/am335x_evm_defconfig
  5. 1 0
      configs/am335x_evm_nor_defconfig
  6. 1 0
      configs/am335x_evm_norboot_defconfig
  7. 1 0
      configs/am335x_evm_spiboot_defconfig
  8. 1 0
      configs/am335x_evm_usbspl_defconfig
  9. 1 0
      configs/am335x_gp_evm_defconfig
  10. 2 0
      configs/am3517_evm_defconfig
  11. 1 0
      configs/birdland_bav335a_defconfig
  12. 1 0
      configs/birdland_bav335b_defconfig
  13. 2 0
      configs/cm_t3517_defconfig
  14. 1 0
      configs/draco_defconfig
  15. 1 0
      configs/pcm051_rev1_defconfig
  16. 1 0
      configs/pcm051_rev3_defconfig
  17. 1 0
      configs/pengwyn_defconfig
  18. 1 0
      configs/pxm2_defconfig
  19. 1 0
      configs/rastaban_defconfig
  20. 1 0
      configs/rut_defconfig
  21. 1 0
      configs/thuban_defconfig
  22. 0 2
      include/configs/am335x_evm.h
  23. 0 1
      include/configs/am3517_evm.h
  24. 0 2
      include/configs/baltos.h
  25. 0 2
      include/configs/bav335x.h
  26. 0 1
      include/configs/cm_t3517.h
  27. 0 1
      include/configs/pcm051.h
  28. 0 2
      include/configs/pengwyn.h
  29. 0 1
      include/configs/siemens-am33x-common.h

+ 1 - 0
configs/am335x_baltos_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_SETEXPR is not set
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_boneblack_defconfig
View File 

@@ -19,6 +19,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_boneblack_vboot_defconfig
View File 

@@ -26,6 +26,7 @@ CONFIG_SYS_NS16550=y
 
 CONFIG_TIMER=y
 
 CONFIG_OMAP_TIMER=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_evm_defconfig
View File 

@@ -18,6 +18,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_evm_nor_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_evm_norboot_defconfig
View File 

@@ -11,6 +11,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_evm_spiboot_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_evm_usbspl_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/am335x_gp_evm_defconfig
View File 

@@ -20,6 +20,7 @@ CONFIG_SYS_NS16550=y
 
 CONFIG_TIMER=y
 
 CONFIG_OMAP_TIMER=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 2 - 0
configs/am3517_evm_defconfig
View File 

@@ -13,4 +13,6 @@ CONFIG_SYS_PROMPT="AM3517_EVM # "
 
 CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_SETEXPR is not set
 
 CONFIG_SYS_NS16550=y
 
+CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/birdland_bav335a_defconfig
View File 

@@ -13,6 +13,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/birdland_bav335b_defconfig
View File 

@@ -13,6 +13,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 2 - 0
configs/cm_t3517_defconfig
View File 

@@ -9,4 +9,6 @@ CONFIG_SYS_PROMPT="CM-T3517 # "
 
 CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_SETEXPR is not set
 
 CONFIG_SYS_NS16550=y
 
+CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/draco_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/pcm051_rev1_defconfig
View File 

@@ -11,6 +11,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/pcm051_rev3_defconfig
View File 

@@ -11,6 +11,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/pengwyn_defconfig
View File 

@@ -8,6 +8,7 @@ CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_SETEXPR is not set
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/pxm2_defconfig
View File 

@@ -15,6 +15,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/rastaban_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/rut_defconfig
View File 

@@ -15,6 +15,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 1 - 0
configs/thuban_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
+CONFIG_USB_MUSB_HOST=y
 
 CONFIG_USB_MUSB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DOWNLOAD=y

+ 0 - 2
include/configs/am335x_evm.h
View File 

@@ -287,7 +287,6 @@
 
 #define CONFIG_ARCH_MISC_INIT
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
-#define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_AM335X_USB0
 
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
 
 #define CONFIG_AM335X_USB1
 
@@ -337,7 +336,6 @@
 
 #define CONFIG_ENV_IS_NOWHERE
 
 #undef CONFIG_ENV_IS_IN_NAND
 
 /* disable host part of MUSB in SPL */
 
-#undef CONFIG_USB_MUSB_HOST
 
 /* disable EFI partitions and partition UUID support */
 
 #undef CONFIG_PARTITION_UUIDS
 
 #undef CONFIG_EFI_PARTITION

+ 0 - 1
include/configs/am3517_evm.h
View File 

@@ -94,7 +94,6 @@
 
  * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
 
  */
 
 #define CONFIG_USB_MUSB_AM35X
 
-#define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 
 #ifdef CONFIG_USB_MUSB_AM35X

+ 0 - 2
include/configs/baltos.h
View File 

@@ -273,7 +273,6 @@
 
 #define CONFIG_ARCH_MISC_INIT
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
-#define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_AM335X_USB0
 
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
 
 #define CONFIG_AM335X_USB1
 
@@ -292,7 +291,6 @@
 
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
 
 /* disable host part of MUSB in SPL */
 
-#undef CONFIG_USB_MUSB_HOST
 
 /* disable EFI partitions and partition UUID support */
 
 #undef CONFIG_PARTITION_UUIDS
 
 #undef CONFIG_EFI_PARTITION

+ 0 - 2
include/configs/bav335x.h
View File 

@@ -438,7 +438,6 @@ DEFAULT_LINUX_BOOT_ENV \
 
 #define CONFIG_ARCH_MISC_INIT
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
-#define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_AM335X_USB0
 
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
 
 #define CONFIG_AM335X_USB1
 
@@ -469,7 +468,6 @@ DEFAULT_LINUX_BOOT_ENV \
 
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
 
 /* disable host part of MUSB in SPL */
 
-#undef CONFIG_USB_MUSB_HOST
 
 /* disable EFI partitions and partition UUID support */
 
 #undef CONFIG_PARTITION_UUIDS
 
 #undef CONFIG_EFI_PARTITION

+ 0 - 1
include/configs/cm_t3517.h
View File 

@@ -113,7 +113,6 @@
 
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
 
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
 
 #else /* !CONFIG_USB_MUSB_AM35X */
 
-#define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 #endif /* CONFIG_USB_MUSB_AM35X */

+ 0 - 1
include/configs/pcm051.h
View File 

@@ -142,7 +142,6 @@
 
 #define CONFIG_USB_MUSB_DSPS
 
 #define CONFIG_ARCH_MISC_INIT
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
-#define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_AM335X_USB0
 
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
 
 #define CONFIG_AM335X_USB1

+ 0 - 2
include/configs/pengwyn.h
View File 

@@ -198,7 +198,6 @@
 
 #define CONFIG_ARCH_MISC_INIT
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
-#define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_AM335X_USB0
 
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
 
 #define CONFIG_AM335X_USB1
 
@@ -211,7 +210,6 @@
 
 
 #if defined(CONFIG_SPL_BUILD)
 
 /* disable host part of MUSB in SPL */
 
-#undef CONFIG_USB_MUSB_HOST
 
 /* Disable CPSW SPL support so we fit within the 101KiB limit. */
 
 #undef CONFIG_SPL_ETH_SUPPORT
 
 #endif

+ 0 - 1
include/configs/siemens-am33x-common.h
View File 

@@ -222,7 +222,6 @@
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
 #undef CONFIG_USB_GADGET_DUALSPEED
 
-#define CONFIG_USB_MUSB_HOST
 
 
 #define CONFIG_AM335X_USB0
 
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL