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 cont...@paulk.fr
---
arch/arm/cpu/armv7/am33xx/board.c | 2 +-
board/birdland/bav335x/board.c | 2 +-
board/compulab/cm_t3517/cm_t3517.c | 6 +++---
board/logicpd/am3517evm/am3517evm.c| 8
board/phytec/pcm051/board.c| 2 +-
board/siemens/draco/board.c| 2 +-
board/siemens/pxm2/board.c | 2 +-
board/siemens/rut/board.c | 2 +-
board/sunxi/board.c| 6 +++---
board/ti/am335x/board.c| 2 +-
board/ti/beagle/beagle.c | 8
board/vscom/baltos/board.c | 2 +-
drivers/usb/gadget/gadget_chips.h | 2 +-
drivers/usb/musb-new/Makefile | 6 +++---
drivers/usb/musb-new/musb_core.c | 12 ++--
drivers/usb/musb-new/musb_core.h | 4 ++--
drivers/usb/musb-new/musb_dma.h| 2 +-
drivers/usb/musb-new/musb_gadget.c | 4 ++--
drivers/usb/musb-new/musb_uboot.c | 12 ++--
include/configs/am335x_evm.h | 16
include/configs/am3517_evm.h | 16
include/configs/baltos.h | 16
include/configs/bav335x.h | 16
include/configs/cm_t3517.h | 4 ++--
include/configs/kwb.h | 10 +-
include/configs/omap3_beagle.h | 4 ++--
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/tseries.h | 10 +-
include/usb.h | 6 +++---
32 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/arch/arm/cpu/armv7/am33xx/board.c
b/arch/arm/cpu/armv7/am33xx/board.c
index 67bef23..377c611 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -124,7 +124,7 @@ int cpu_mmc_init(bd_t *bis)
#endif
/* AM33XX has two MUSB controllers which can be host or gadget */
-#if (defined(CONFIG_MUSB_GADGET) || defined(CONFIG_MUSB_HOST)) \
+#if (defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST)) \
(defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1))
static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c
index 32ff7a4..67aca3c 100644
--- a/board/birdland/bav335x/board.c
+++ b/board/birdland/bav335x/board.c
@@ -363,7 +363,7 @@ static struct cpsw_platform_data cpsw_data = {
#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT))
\
defined(CONFIG_SPL_BUILD)) || \
((defined(CONFIG_DRIVER_TI_CPSW) || \
- defined(CONFIG_USB_ETHER) defined(CONFIG_MUSB_GADGET)) \
+ defined(CONFIG_USB_ETHER) defined(CONFIG_USB_MUSB_GADGET)) \
!defined(CONFIG_SPL_BUILD))
int board_eth_init(bd_t *bis)
{
diff --git a/board/compulab/cm_t3517/cm_t3517.c
b/board/compulab/cm_t3517/cm_t3517.c
index 03b2bad..b33522e 100644
--- a/board/compulab/cm_t3517/cm_t3517.c
+++ b/board/compulab/cm_t3517/cm_t3517.c
@@ -50,12 +50,12 @@ static struct omap_musb_board_data cm_t3517_musb_board_data
= {
};
static struct musb_hdrc_platform_data cm_t3517_musb_pdata = {
-#if defined(CONFIG_MUSB_HOST)
+#if defined(CONFIG_USB_MUSB_HOST)
.mode = MUSB_HOST,
-#elif defined(CONFIG_MUSB_GADGET)
+#elif defined(CONFIG_USB_MUSB_GADGET)
.mode = MUSB_PERIPHERAL,
#else
-#error Please define either CONFIG_MUSB_HOST or CONFIG_MUSB_GADGET
+#error Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET
#endif
.config = cm_t3517_musb_config,
.power = 250,
diff --git a/board/logicpd/am3517evm/am3517evm.c
b/board/logicpd/am3517evm/am3517evm.c
index 24be6ea..24ff9c3 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -65,12 +65,12 @@ static struct omap_musb_board_data musb_board_data = {
};
static struct musb_hdrc_platform_data musb_plat = {
-#if defined(CONFIG_MUSB_HOST)
+#if defined(CONFIG_USB_MUSB_HOST)
.mode = MUSB_HOST,
-#elif defined(CONFIG_MUSB_GADGET)
+#elif defined(CONFIG_USB_MUSB_GADGET)
.mode = MUSB_PERIPHERAL,
#else
-#error Please define either CONFIG_MUSB_HOST or CONFIG_MUSB_GADGET
+#error Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET
#endif
.config = musb_config,
.power = 250,
@@ -159,7 +159,7 @@ int board_mmc_init(bd_t *bis)
}
#endif
-#if defined(CONFIG_USB_ETHER)
