diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2015-08-04 17:04:06 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2015-08-05 17:20:34 +0200 |
| commit | 95de1e2f26b562156210833ff667be6d071de019 (patch) | |
| tree | 530344b5a4facba0eeb493123b2be8f752654103 /board/ti | |
| parent | 68f7c5db2d1e714c15b49b0759ddef8f8344f184 (diff) | |
| download | talos-obmc-uboot-95de1e2f26b562156210833ff667be6d071de019.tar.gz talos-obmc-uboot-95de1e2f26b562156210833ff667be6d071de019.zip | |
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 <contact@paulk.fr>
Diffstat (limited to 'board/ti')
| -rw-r--r-- | board/ti/am335x/board.c | 2 | ||||
| -rw-r--r-- | board/ti/beagle/beagle.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 96245a3306..1dc2ed0cf4 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -569,7 +569,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/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 7b37fbe299..3b0a9e7141 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -306,12 +306,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 = 100, @@ -568,7 +568,7 @@ int ehci_hcd_stop(int index) #endif /* CONFIG_USB_EHCI */ -#if defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET) +#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) int board_eth_init(bd_t *bis) { return usb_eth_initialize(bis); |
