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>

diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 51cabb43e3f18cb2a695edff087f065d9d21e97c..0ddf0611842d9d08446851475cacd881824d279f 100644 (file)
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -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

diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 7e0dcf5e5df88f7ae7550dbf9555142de2145581..79e469d9e5c173bfa5ab0e5f483ac55dad47a59e 100644 (file)
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -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

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index e5daa946579df6910fb0f0cf7b9223ddc1c3aecf..89aba13b4e76f0042888a54e8ce2316a8010ca65 100644 (file)
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -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

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index d40a9e6886489e66d8279986f33a4110a4fa7855..e21d98e5dd80ac1d5cbd6c0b4c5fc697c2d901f3 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -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

diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index aebfb58899912ba279ea3f3d0755bd6eb0f1f484..67a048eb9d2b6f5b97825e7702acedf1219a1064 100644 (file)
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -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

diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index bc4f6673b96d566067fa872a1b58ec0285d466b2..332f37f5a8f91332da76bc4f0679f6f3168c1bea 100644 (file)
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -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

diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 346def4bcdadcc5e18972c3df0170a2dd4e9916d..4b305030dddb40a8cd7519220196fd0c371c3a0f 100644 (file)
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -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

diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index c457f6fa875699c07fa5128f5bae7375d28d754f..7ed400bf3fd6d270a05d2b9fa68c5da5bb25d2a7 100644 (file)
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -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

diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig
index 554af516562c1e07b57418cb935bb729f97e64ed..98591896e917e0a383a49f6624e4be08747b12dc 100644 (file)
--- a/configs/am335x_gp_evm_defconfig
+++ b/configs/am335x_gp_evm_defconfig
@@ -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

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index b9edf0d8cb08505b6249e9e08e92a68ce68d8e52..1e0b35a9a41968d152dfb0d31339489a75f16ac2 100644 (file)
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -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

diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 1e22f5c65c4e10cd7471ef2ec9699b654bdecda2..5d1c0dc2548a849cb40d32bdd7b9354646960ab7 100644 (file)
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -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

diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index c024d03f0df97d2851a62d207220acf7d08cf814..a4aa6d9b480f3db81ea5a65a58938f08f08b84b1 100644 (file)
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -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

diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index ea3e492886f9fb826dde4e26c8d0369f8c7adeba..80a7c34c0076802f00951e5d28a4a60ced4f3ca8 100644 (file)
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -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

diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index abbc63625459e23e272d69f0ac1ab642c81b24e4..1b3aea52e17ec6f9fca9c7ae2c9f28299668cfa7 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -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

diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index ee729b1fd3561d2a986efc98d7ec905f9db35cf1..c97faf09156097d46ebba1c33d6a029a3c4191e5 100644 (file)
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -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

diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index 632e764bdc158983046f108183a8790294f886a7..63ef0bbc14117c06c9b26282405645bf839ea528 100644 (file)
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -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

diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index d04471bfe245a43c47a195bf8551c6e5b65858a8..4aead9ed3d8a02a3a60f93cb9c5978e17ea19f30 100644 (file)
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -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

diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 95ab0a307ddab47228969a8b09f45f28ef6ae362..cd8996a30b634f92cb74687d9ce2da8663013e00 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -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

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index c6a11309bb40874a3d0f046b8d47356fe31ae8c5..a3d2b8670cb9fdebe58e643febd74c686256c9c7 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -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

diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index d7b47e217e1f469b2e47c7e1d1e2205c5e85bd9e..75264266508c523e2bb61f49005bc0273f9bdb1a 100644 (file)
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -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

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index c051460664d598e863da52834d4d9d459aadcd90..c81e4117a3c26314ce22f9f309252343a8d82157 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -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

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 1b1684d7bfe584e4f4cd7f4dfa2603431ee46cdf..55f8dc5918ad5e19299296cccb61866a7f131cef 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -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

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index f33c7b7ca7f3e2d3400c9bf87806b81b6fdbd0a4..45f016af55b50c6bf9fa9ddd928a98e75d0d050b 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -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

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 48d0613a0b69e8bd1314862f105c9a737db857bb..23d0bb74e21a1748c35ef5df6cc775ee407640dc 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -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

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 2c0ec9df9f116538dc5c3b13069273d608a8ffab..44ac2da59545b56715af1a12b122a72eea9ec252 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -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

diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index ca0b47e4ee49257959223380cb4b1ebda492bb2f..553b648f783c762b4eb72502d3b7016c2104d7c1 100644 (file)
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -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 */
 

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 3e66c195e1719369bab1e101a21b4a00d6b88266..4638c25f062d6a9ce63e3baad530bc9ab1319adb 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -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

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 8977115da378ed497c073b97020aa7796120b87f..b75dbeef6220a7e26dba8184459529c1d767e6d5 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -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

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 481b89dc747013e43fee16c5895a7b6fec28eadf..6af373e986bd6b2602e771b3d828c03d640bd9dd 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -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