From 95de1e2f26b562156210833ff667be6d071de019 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 4 Aug 2015 17:04:06 +0200 Subject: usb: musb-new: CONFIG_MUSB prefix replacement with CONFIG_USB_MUSB USB-related options are usually prefixed with CONFIG_USB and platform-specific adaptation for the MUSB controller already have a CONFIG_USB_MUSB prefix, so this switches all MUSB-related options to a CONFIG_USB_MUSB prefix, for consistency. Signed-off-by: Paul Kocialkowski --- include/configs/am335x_evm.h | 16 ++++++++-------- include/configs/am3517_crane.h | 14 +++++++------- include/configs/am3517_evm.h | 16 ++++++++-------- include/configs/baltos.h | 16 ++++++++-------- include/configs/bav335x.h | 16 ++++++++-------- include/configs/bf526-ezbrd.h | 4 ++-- include/configs/bf527-ezkit.h | 4 ++-- include/configs/bf548-ezkit.h | 4 ++-- include/configs/cam_enc_4xx.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/cm_t3517.h | 4 ++-- include/configs/da830evm.h | 10 +++++----- include/configs/davinci_dm355evm.h | 4 ++-- include/configs/davinci_dm365evm.h | 10 +++++----- include/configs/davinci_dvevm.h | 4 ++-- include/configs/kwb.h | 10 +++++----- include/configs/nokia_rx51.h | 4 ++-- include/configs/omap3_beagle.h | 4 ++-- include/configs/omap3_evm.h | 8 ++++---- include/configs/omap3_evm_common.h | 8 ++++---- include/configs/omap3_igep00x0.h | 2 +- include/configs/omap3_mvblx.h | 2 +- include/configs/omap3_zoom1.h | 2 +- include/configs/pcm051.h | 12 ++++++------ include/configs/pengwyn.h | 12 ++++++------ include/configs/siemens-am33x-common.h | 14 +++++++------- include/configs/sunxi-common.h | 4 ++-- include/configs/ti_omap4_common.h | 2 +- include/configs/tseries.h | 10 +++++----- 29 files changed, 110 insertions(+), 110 deletions(-) (limited to 'include/configs') diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 633391bc93..e89c49e1e3 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -283,14 +283,14 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 @@ -309,12 +309,12 @@ #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" @@ -323,7 +323,7 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xD022 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* Remove other SPL modes. */ @@ -333,7 +333,7 @@ #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ -#undef CONFIG_MUSB_HOST +#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_crane.h b/include/configs/am3517_crane.h index 6a0240b903..600fefbc20 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -91,15 +91,15 @@ /* * USB configuration - * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard - * Enable CONFIG_MUSB_UDC for Device functionalities. + * Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard + * Enable CONFIG_USB_MUSB_UDC for Device functionalities. */ #define CONFIG_USB_AM35X 1 -#define CONFIG_MUSB_HCD 1 +#define CONFIG_USB_MUSB_HCD 1 #ifdef CONFIG_USB_AM35X -#ifdef CONFIG_MUSB_HCD +#ifdef CONFIG_USB_MUSB_HCD #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -111,9 +111,9 @@ #define CONFIG_PREBOOT "usb start" #endif /* CONFIG_USB_KEYBOARD */ -#endif /* CONFIG_MUSB_HCD */ +#endif /* CONFIG_USB_MUSB_HCD */ -#ifdef CONFIG_MUSB_UDC +#ifdef CONFIG_USB_MUSB_UDC /* USB device configuration */ #define CONFIG_USB_DEVICE 1 #define CONFIG_USB_TTY 1 @@ -123,7 +123,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "AM3517CRANE" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ #endif /* CONFIG_USB_AM35X */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index e9808a7473..30f31a93ad 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -97,16 +97,16 @@ /* * USB configuration - * Enable CONFIG_MUSB_HOST for Host functionalities MSC, keyboard - * Enable CONFIG_MUSB_GADGET for Device functionalities. + * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard + * Enable CONFIG_USB_MUSB_GADGET for Device functionalities. */ #define CONFIG_USB_MUSB_AM35X -#define CONFIG_MUSB_HOST -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_HOST +#define CONFIG_USB_MUSB_PIO_ONLY #ifdef CONFIG_USB_MUSB_AM35X -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -118,13 +118,13 @@ #define CONFIG_PREBOOT "usb start" #endif /* CONFIG_USB_KEYBOARD */ -#endif /* CONFIG_MUSB_HOST */ +#endif /* CONFIG_USB_MUSB_HOST */ -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_AM35X */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index cce5e4f285..5545cf0f10 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -273,25 +273,25 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USBDOWNLOAD_GADGET #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_OTG -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" @@ -300,11 +300,11 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x0403 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ -#undef CONFIG_MUSB_HOST +#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 fa32fa43d1..9917627fc0 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -440,14 +440,14 @@ DEFAULT_LINUX_BOOT_ENV \ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 @@ -466,12 +466,12 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE @@ -479,11 +479,11 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xD022 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ -#undef CONFIG_MUSB_HOST +#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/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 5767ac1bd7..a8f0979624 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -136,10 +136,10 @@ */ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #define CONFIG_USB -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_TIMEOUT 100000 +#define CONFIG_USB_MUSB_TIMEOUT 100000 #endif diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 28b3760f69..d23602bb32 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -139,10 +139,10 @@ */ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #define CONFIG_USB -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_TIMEOUT 100000 +#define CONFIG_USB_MUSB_TIMEOUT 100000 #endif /* Don't waste time transferring a logo over the UART */ diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index c7b44ae427..f0f768ac09 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -163,10 +163,10 @@ */ #if !defined(__ADSPBF544__) #define CONFIG_USB -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_TIMEOUT 100000 +#define CONFIG_USB_MUSB_TIMEOUT 100000 #endif diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index 21e3a0c2db..3400dd46f9 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -488,7 +488,7 @@ /* USB Configuration */ #define CONFIG_USB_DAVINCI -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN | \ USBPHY_PHY24MHZ) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 41df106ee0..6885ae1e36 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -100,7 +100,7 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_STORAGE -#define CONFIG_MUSB_UDC +#define CONFIG_USB_MUSB_UDC #define CONFIG_TWL4030_USB #define CONFIG_CMD_USB diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index a8d0b97287..cf0841499b 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -112,8 +112,8 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147 #else /* !CONFIG_USB_MUSB_AM35X */ -#define CONFIG_MUSB_HOST -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_HOST +#define CONFIG_USB_MUSB_PIO_ONLY #endif /* CONFIG_USB_MUSB_AM35X */ #define CONFIG_USB_STORAGE diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index 729b6e74aa..b82140e939 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -135,7 +135,7 @@ * USB configuration */ #define CONFIG_USB_DA8XX /* Platform hookup to MUSB controller */ -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD /* * U-Boot general configuration @@ -233,7 +233,7 @@ #ifdef CONFIG_USB_DA8XX -#ifdef CONFIG_MUSB_HCD /* include support for usb host */ +#ifdef CONFIG_USB_MUSB_HCD /* include support for usb host */ #define CONFIG_CMD_USB /* include support for usb cmd */ #define CONFIG_USB_STORAGE /* MSC class support */ @@ -244,9 +244,9 @@ #define CONFIG_PREBOOT "usb start" #endif /* CONFIG_USB_KEYBOARD */ -#endif /* CONFIG_MUSB_HCD */ +#endif /* CONFIG_USB_MUSB_HCD */ -#ifdef CONFIG_MUSB_UDC +#ifdef CONFIG_USB_MUSB_UDC /* USB device configuration */ #define CONFIG_USB_DEVICE 1 #define CONFIG_USB_TTY 1 @@ -256,7 +256,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "DA830EVM" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ #endif /* CONFIG_USB_DA8XX */ diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index 847d788292..e873fa4d8d 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -96,11 +96,11 @@ #endif #ifdef CONFIG_USB_DAVINCI -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #else -#undef CONFIG_MUSB_HCD +#undef CONFIG_USB_MUSB_HCD #undef CONFIG_CMD_USB #undef CONFIG_USB_STORAGE #endif diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index 8b42c50dd9..9bdd2d6611 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -78,7 +78,7 @@ /* USB Configuration */ #define CONFIG_USB_DAVINCI -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #ifdef CONFIG_USB_DAVINCI #define CONFIG_CMD_USB /* include support for usb */ @@ -87,7 +87,7 @@ #define CONFIG_DOS_PARTITION /* include support for FAT/storage*/ #endif -#ifdef CONFIG_MUSB_HCD /* include support for usb host */ +#ifdef CONFIG_USB_MUSB_HCD /* include support for usb host */ #define CONFIG_CMD_USB /* include support for usb cmd */ #define CONFIG_USB_STORAGE /* MSC class support */ #define CONFIG_CMD_STORAGE /* inclue support for usb-storage cmd */ @@ -99,9 +99,9 @@ #define CONFIG_PREBOOT "usb start" #endif /* CONFIG_USB_KEYBOARD */ -#endif /* CONFIG_MUSB_HCD */ +#endif /* CONFIG_USB_MUSB_HCD */ -#ifdef CONFIG_MUSB_UDC +#ifdef CONFIG_USB_MUSB_UDC #define CONFIG_USB_DEVICE 1 #define CONFIG_USB_TTY 1 #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 @@ -109,7 +109,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "DM365VM" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ /* U-Boot command configuration */ #define CONFIG_CMD_ASKENV diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index 61087363b2..35e9a15a9d 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -156,7 +156,7 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_DAVINCI /*===================*/ /* Linux Information */ @@ -194,7 +194,7 @@ /*==========================*/ #ifdef CONFIG_USB_DAVINCI #define CONFIG_CMD_USB -#ifdef CONFIG_MUSB_HCD +#ifdef CONFIG_USB_MUSB_HCD #define CONFIG_USB_STORAGE #define CONFIG_CMD_STORAGE #define CONFIG_CMD_FAT diff --git a/include/configs/kwb.h b/include/configs/kwb.h index acff5b9f89..96f2e9d39b 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -116,20 +116,20 @@ BUR_COMMON_ENV \ /* USB configuration */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT /* attention! not only for gadget, enables also highspeed in hostmode */ #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE -#endif /* CONFIG_MUSB_HOST */ +#endif /* CONFIG_USB_MUSB_HOST */ #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 6e3ce4d3c7..7ec9965a46 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -108,8 +108,8 @@ #define CONFIG_DOS_PARTITION /* USB */ -#define CONFIG_MUSB_UDC -#define CONFIG_MUSB_HCD +#define CONFIG_USB_MUSB_UDC +#define CONFIG_USB_MUSB_HCD #define CONFIG_USB_OMAP3 #define CONFIG_TWL4030_USB diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 804e30708f..dbe3e9be8c 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -59,9 +59,9 @@ #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}} /* USB */ -#define CONFIG_MUSB_GADGET +#define CONFIG_USB_MUSB_GADGET #define CONFIG_USB_MUSB_OMAP2PLUS -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_TWL4030_USB 1 #define CONFIG_USB_ETHER diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 70fab4b0f4..1dd71a8eb6 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -77,12 +77,12 @@ /* USB * - * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard - * Enable CONFIG_MUSB_UDD for Device functionalities. + * Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard + * Enable CONFIG_USB_MUSB_UDD for Device functionalities. */ #define CONFIG_USB_OMAP3 -#define CONFIG_MUSB_HCD -/* #define CONFIG_MUSB_UDC */ +#define CONFIG_USB_MUSB_HCD +/* #define CONFIG_USB_MUSB_UDC */ /* NAND SPL */ #define CONFIG_SPL_NAND_SIMPLE diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 370f21e3ee..66c314fc42 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -146,7 +146,7 @@ */ #ifdef CONFIG_USB_OMAP3 -#ifdef CONFIG_MUSB_HCD +#ifdef CONFIG_USB_MUSB_HCD #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -158,9 +158,9 @@ #define CONFIG_PREBOOT "usb start" #endif /* CONFIG_USB_KEYBOARD */ -#endif /* CONFIG_MUSB_HCD */ +#endif /* CONFIG_USB_MUSB_HCD */ -#ifdef CONFIG_MUSB_UDC +#ifdef CONFIG_USB_MUSB_UDC /* USB device configuration */ #define CONFIG_USB_DEVICE #define CONFIG_USB_TTY @@ -171,7 +171,7 @@ #define CONFIG_USBD_PRODUCTID 0x5678 #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "EVM" -#endif /* CONFIG_MUSB_UDC */ +#endif /* CONFIG_USB_MUSB_UDC */ #endif /* CONFIG_USB_OMAP3 */ diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 89ec73cc36..8785d8fd50 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -54,7 +54,7 @@ #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 4339b0558c..19543a12b2 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -94,7 +94,7 @@ #define CONFIG_SILENT_CONSOLE 1 /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index d90cc42d93..2d1d53dc38 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -49,7 +49,7 @@ */ /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index d80cf32cbe..275e952fb2 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -143,24 +143,24 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #define CONFIG_PHY_GIGE #define CONFIG_PHYLIB diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 4684ad6852..ccb5dd3c03 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -174,26 +174,26 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#if defined(CONFIG_MUSB_HOST) +#if defined(CONFIG_USB_MUSB_HOST) #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif #if defined(CONFIG_SPL_BUILD) /* disable host part of MUSB in SPL */ -#undef CONFIG_MUSB_HOST +#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 f7bef706eb..08235c7445 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -226,27 +226,27 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_GADGET -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_GADGET +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #undef CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif -#ifdef CONFIG_MUSB_GADGET +#ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -#endif /* CONFIG_MUSB_GADGET */ +#endif /* CONFIG_USB_MUSB_GADGET */ #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DOWNLOAD diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 5adcc39e02..c002342034 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -326,8 +326,8 @@ extern int soft_i2c_gpio_scl; #endif #ifdef CONFIG_USB_MUSB_SUNXI -#define CONFIG_MUSB_HOST -#define CONFIG_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_HOST +#define CONFIG_USB_MUSB_PIO_ONLY #endif #ifdef CONFIG_USB_KEYBOARD diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index b299aedb2e..2eaa3b61b4 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -70,7 +70,7 @@ #endif /* USB */ -#define CONFIG_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 /* USB device configuration */ diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 6a1835efe6..4265b8a4ff 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -245,20 +245,20 @@ MMCARGS /* USB configuration */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_MUSB_PIO_ONLY -#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT /* attention! not only for gadget, enables also highspeed in hostmode */ #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_MUSB_HOST +#define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_MUSB_HOST +#ifdef CONFIG_USB_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE -#endif /* CONFIG_MUSB_HOST */ +#endif /* CONFIG_USB_MUSB_HOST */ #if defined(CONFIG_SPI_BOOT) /* McSPI IP block */ -- cgit v1.2.3