[U-Boot] [PATCH V2] Convert CONFIG_USB_MUSB_OMAP2PLUS et al to Kconfig
Paul Kocialkowski
contact at paulk.fr
Fri Dec 29 15:52:50 UTC 2017
Hi,
Le vendredi 29 décembre 2017 à 08:16 -0600, Adam Ford a écrit :
> This converts the following to Kconfig:
> CONFIG_USB_MUSB_OMAP2PLUS
> CONFIG_USB_MUSB_AM35X
> CONFIG_USB_MUSB_DSPS
> CONFIG_USB_MUSB_PIO_ONLY
Thanks for making the change! See more comments below for two minor
changes.
> Signed-off-by: Adam Ford <aford173 at gmail.com>
> ---
> Changes to V2: Add AM35X and DSPS.
> Make CONFIG_USB_MUSB_PIO_ONLY enabled when
> USB_MUSB_PIC32, USB_MUSB_OMAP2PLUS,
> USB_MUSB_AM35X, USB_MUSB_DSPS, or
> USB_MUSB_SUNXI are enabled
>
> configs/am335x_baltos_defconfig | 1 +
> configs/am335x_boneblack_defconfig | 1 +
> configs/am335x_boneblack_vboot_defconfig | 1 +
> configs/am335x_evm_defconfig | 1 +
> configs/am335x_evm_nor_defconfig | 1 +
> configs/am335x_evm_norboot_defconfig | 1 +
> configs/am335x_evm_spiboot_defconfig | 1 +
> configs/am335x_evm_usbspl_defconfig | 1 +
> configs/am335x_hs_evm_defconfig | 1 +
> configs/am335x_hs_evm_uart_defconfig | 1 +
> configs/am3517_evm_defconfig | 1 +
> configs/birdland_bav335a_defconfig | 1 +
> configs/birdland_bav335b_defconfig | 1 +
> configs/brppt1_mmc_defconfig | 1 +
> configs/brppt1_nand_defconfig | 1 +
> configs/brppt1_spi_defconfig | 1 +
> configs/brxre1_defconfig | 1 +
> configs/chiliboard_defconfig | 1 +
> configs/cm_t3517_defconfig | 1 +
> configs/draco_defconfig | 1 +
> configs/etamin_defconfig | 1 +
> configs/kc1_defconfig | 1 +
> configs/omap3_beagle_defconfig | 1 +
> configs/omap3_evm_defconfig | 1 +
> configs/omap3_logic_defconfig | 1 +
> configs/pcm051_rev1_defconfig | 1 +
> configs/pcm051_rev3_defconfig | 1 +
> configs/pengwyn_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/rut_defconfig | 1 +
> configs/sniper_defconfig | 1 +
> configs/thuban_defconfig | 1 +
> drivers/usb/musb-new/Kconfig | 17 +++++++++++++++++
> include/configs/am335x_evm.h | 2 --
> include/configs/am3517_evm.h | 2 --
> include/configs/baltos.h | 2 --
> include/configs/bav335x.h | 2 --
> include/configs/brppt1.h | 2 --
> include/configs/brxre1.h | 2 --
> include/configs/chiliboard.h | 2 --
> include/configs/cm_t3517.h | 3 ---
> include/configs/kc1.h | 3 ---
> include/configs/omap3_beagle.h | 2 --
> include/configs/omap3_evm.h | 2 --
> include/configs/omap3_logic.h | 2 --
> include/configs/pcm051.h | 2 --
> include/configs/pengwyn.h | 2 --
> include/configs/pic32mzdask.h | 1 -
> include/configs/siemens-am33x-common.h | 2 --
> include/configs/sniper.h | 2 --
> include/configs/sunxi-common.h | 4 ----
> scripts/config_whitelist.txt | 4 ----
> 53 files changed, 50 insertions(+), 43 deletions(-)
>
> diff --git a/configs/am335x_baltos_defconfig
> b/configs/am335x_baltos_defconfig
> index 0ef9f42..548e045 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -55,6 +55,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_boneblack_defconfig
> b/configs/am335x_boneblack_defconfig
> index 55e0ebd..f351619 100644
> --- a/configs/am335x_boneblack_defconfig
> +++ b/configs/am335x_boneblack_defconfig
> @@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_boneblack_vboot_defconfig
> b/configs/am335x_boneblack_vboot_defconfig
> index fe5b9e7..e141106 100644
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ b/configs/am335x_boneblack_vboot_defconfig
> @@ -42,6 +42,7 @@ CONFIG_OMAP_TIMER=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_evm_defconfig
> b/configs/am335x_evm_defconfig
> index 9c97009..9e79d1c 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -47,6 +47,7 @@ CONFIG_DM_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_MUSB_TI=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_evm_nor_defconfig
> b/configs/am335x_evm_nor_defconfig
> index 1813003..14aa267 100644
> --- a/configs/am335x_evm_nor_defconfig
> +++ b/configs/am335x_evm_nor_defconfig
> @@ -34,6 +34,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_evm_norboot_defconfig
> b/configs/am335x_evm_norboot_defconfig
> index b38d7f6..22182f5 100644
> --- a/configs/am335x_evm_norboot_defconfig
> +++ b/configs/am335x_evm_norboot_defconfig
> @@ -30,6 +30,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_evm_spiboot_defconfig
> b/configs/am335x_evm_spiboot_defconfig
> index 7a20576..71d6a28 100644
> --- a/configs/am335x_evm_spiboot_defconfig
> +++ b/configs/am335x_evm_spiboot_defconfig
> @@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_evm_usbspl_defconfig
> b/configs/am335x_evm_usbspl_defconfig
> index 1e80017..10d6d38 100644
> --- a/configs/am335x_evm_usbspl_defconfig
> +++ b/configs/am335x_evm_usbspl_defconfig
> @@ -38,6 +38,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_hs_evm_defconfig
> b/configs/am335x_hs_evm_defconfig
> index 78cf48d..a26fd09 100644
> --- a/configs/am335x_hs_evm_defconfig
> +++ b/configs/am335x_hs_evm_defconfig
> @@ -53,6 +53,7 @@ CONFIG_DM_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_MUSB_TI=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/am335x_hs_evm_uart_defconfig
> b/configs/am335x_hs_evm_uart_defconfig
> index 09aab29..7f05d56 100644
> --- a/configs/am335x_hs_evm_uart_defconfig
> +++ b/configs/am335x_hs_evm_uart_defconfig
> @@ -53,6 +53,7 @@ CONFIG_DM_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_MUSB_TI=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/am3517_evm_defconfig
> b/configs/am3517_evm_defconfig
> index e6c17c7..bb7cc3f 100644
> --- a/configs/am3517_evm_defconfig
> +++ b/configs/am3517_evm_defconfig
> @@ -40,5 +40,6 @@ CONFIG_SPL_NAND_SIMPLE=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> +CONFIG_USB_MUSB_AM35X=y
> # CONFIG_FAT_WRITE is not set
> CONFIG_BCH=y
> diff --git a/configs/birdland_bav335a_defconfig
> b/configs/birdland_bav335a_defconfig
> index 61518f5..d6d5d71 100644
> --- a/configs/birdland_bav335a_defconfig
> +++ b/configs/birdland_bav335a_defconfig
> @@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/birdland_bav335b_defconfig
> b/configs/birdland_bav335b_defconfig
> index c7360c3..0c14595 100644
> --- a/configs/birdland_bav335b_defconfig
> +++ b/configs/birdland_bav335b_defconfig
> @@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> diff --git a/configs/brppt1_mmc_defconfig
> b/configs/brppt1_mmc_defconfig
> index c41a7b4..aa3e317 100644
> --- a/configs/brppt1_mmc_defconfig
> +++ b/configs/brppt1_mmc_defconfig
> @@ -55,6 +55,7 @@ CONFIG_PHYLIB=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_SYS_WHITE_ON_BLACK=y
> CONFIG_LCD=y
> diff --git a/configs/brppt1_nand_defconfig
> b/configs/brppt1_nand_defconfig
> index 3844413..c8063b9 100644
> --- a/configs/brppt1_nand_defconfig
> +++ b/configs/brppt1_nand_defconfig
> @@ -57,6 +57,7 @@ CONFIG_PHYLIB=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_SYS_WHITE_ON_BLACK=y
> CONFIG_LCD=y
> diff --git a/configs/brppt1_spi_defconfig
> b/configs/brppt1_spi_defconfig
> index 25d8837..6385b1a 100644
> --- a/configs/brppt1_spi_defconfig
> +++ b/configs/brppt1_spi_defconfig
> @@ -65,6 +65,7 @@ CONFIG_SYS_NS16550=y
> CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_SYS_WHITE_ON_BLACK=y
> CONFIG_LCD=y
> diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
> index 0c2d7ed..15245dc 100644
> --- a/configs/brxre1_defconfig
> +++ b/configs/brxre1_defconfig
> @@ -56,6 +56,7 @@ CONFIG_PHYLIB=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_SYS_WHITE_ON_BLACK=y
> CONFIG_LCD=y
> diff --git a/configs/chiliboard_defconfig
> b/configs/chiliboard_defconfig
> index bc69df0..a32dab7 100644
> --- a/configs/chiliboard_defconfig
> +++ b/configs/chiliboard_defconfig
> @@ -45,6 +45,7 @@ CONFIG_SYS_NS16550=y
> CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_FAT_WRITE=y
> CONFIG_LZO=y
> diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
> index 819a95b..fa78bde 100644
> --- a/configs/cm_t3517_defconfig
> +++ b/configs/cm_t3517_defconfig
> @@ -48,6 +48,7 @@ CONFIG_SYS_NS16550=y
> CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> +CONFIG_USB_MUSB_AM35X=y
> CONFIG_USB_STORAGE=y
> CONFIG_LCD=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/draco_defconfig b/configs/draco_defconfig
> index be0105f..5444260 100644
> --- a/configs/draco_defconfig
> +++ b/configs/draco_defconfig
> @@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
> index 8e8ef6f..608faf6 100644
> --- a/configs/etamin_defconfig
> +++ b/configs/etamin_defconfig
> @@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
> index 0ddf64c..e828405 100644
> --- a/configs/kc1_defconfig
> +++ b/configs/kc1_defconfig
> @@ -38,6 +38,7 @@ CONFIG_MMC_OMAP_HS=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_OMAP2PLUS=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> diff --git a/configs/omap3_beagle_defconfig
> b/configs/omap3_beagle_defconfig
> index ad72079..1fea12a 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -48,6 +48,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_OMAP2PLUS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="TI"
> diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
> index 5103e9f..c38f142 100644
> --- a/configs/omap3_evm_defconfig
> +++ b/configs/omap3_evm_defconfig
> @@ -54,6 +54,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_OMAP2PLUS=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> diff --git a/configs/omap3_logic_defconfig
> b/configs/omap3_logic_defconfig
> index db72e6f..5b00c06 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -49,6 +49,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_OMAP2PLUS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="TI"
> diff --git a/configs/pcm051_rev1_defconfig
> b/configs/pcm051_rev1_defconfig
> index 273fc30..c16711a 100644
> --- a/configs/pcm051_rev1_defconfig
> +++ b/configs/pcm051_rev1_defconfig
> @@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_ETHER=y
> diff --git a/configs/pcm051_rev3_defconfig
> b/configs/pcm051_rev3_defconfig
> index f1ddaa6..a8fe7af 100644
> --- a/configs/pcm051_rev3_defconfig
> +++ b/configs/pcm051_rev3_defconfig
> @@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_ETHER=y
> diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
> index 4bb6245..78a6b7d 100644
> --- a/configs/pengwyn_defconfig
> +++ b/configs/pengwyn_defconfig
> @@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_FAT_WRITE=y
> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
> index 0ec1591..f682300 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -67,6 +67,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index 5ef1740..c714b07 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> diff --git a/configs/rut_defconfig b/configs/rut_defconfig
> index 1711fc7..2269747 100644
> --- a/configs/rut_defconfig
> +++ b/configs/rut_defconfig
> @@ -68,6 +68,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
> index a8a592f..c75b1ba 100644
> --- a/configs/sniper_defconfig
> +++ b/configs/sniper_defconfig
> @@ -39,6 +39,7 @@ CONFIG_MMC_OMAP_HS=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_OMAP2PLUS=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
> index 2575c00..df76145 100644
> --- a/configs/thuban_defconfig
> +++ b/configs/thuban_defconfig
> @@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> +CONFIG_USB_MUSB_DSPS=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-
> new/Kconfig
> index caba42c..ea5bae2 100644
> --- a/drivers/usb/musb-new/Kconfig
> +++ b/drivers/usb/musb-new/Kconfig
> @@ -23,6 +23,16 @@ config USB_MUSB_TI
> speed USB controller based on the Mentor Graphics
> silicon IP.
>
> +config USB_MUSB_OMAP2PLUS
> + tristate "OMAP2430 and onwards"
> + depends on ARCH_OMAP2PLUS
> +
> +config USB_MUSB_AM35X
> + bool "AM35x"
It would be nice to have a depends line here as well.
From what I can see, this would depend on ARCH_OMAP2PLUS as well
(it looks like AM35x is an omap3).
> +
> +config USB_MUSB_DSPS
> + bool "TI DSPS platforms"
Same here, with a depends on both ARCH_OMAP2PLUS and CONFIG_AM33XX.
> +
> if USB_MUSB_HOST || USB_MUSB_GADGET
>
> config USB_MUSB_PIC32
> @@ -41,3 +51,10 @@ config USB_MUSB_SUNXI
> used on almost all sunxi boards.
>
> endif
> +
> +config USB_MUSB_PIO_ONLY
> + bool "Disable DMA (always use PIO)"
> + default y if USB_MUSB_AM35X || USB_MUSB_PIC32 ||
> USB_MUSB_OMAP2PLUS || USB_MUSB_DSPS || USB_MUSB_SUNXI
> + help
> + All data is copied between memory and FIFO by the CPU.
> + DMA controllers are ignored.
> diff --git a/include/configs/am335x_evm.h
> b/include/configs/am335x_evm.h
> index 856c546..31ab503 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -228,8 +228,6 @@
> * add mass storage support and for gadget we add both RNDIS ethernet
> * and DFU.
> */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> #define CONFIG_AM335X_USB0
> #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
> diff --git a/include/configs/am3517_evm.h
> b/include/configs/am3517_evm.h
> index 33ed85e..ac5070d 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -42,8 +42,6 @@
> * 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_USB_MUSB_PIO_ONLY
>
> #ifdef CONFIG_USB_MUSB_AM35X
>
> diff --git a/include/configs/baltos.h b/include/configs/baltos.h
> index 3fc9e2f..939ee3b 100644
> --- a/include/configs/baltos.h
> +++ b/include/configs/baltos.h
> @@ -272,8 +272,6 @@
> * add mass storage support and for gadget we add both RNDIS ethernet
> * and DFU.
> */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> #define CONFIG_AM335X_USB0
> #define CONFIG_AM335X_USB0_MODE MUSB_HOST
> diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
> index 8917bbe..d084af8 100644
> --- a/include/configs/bav335x.h
> +++ b/include/configs/bav335x.h
> @@ -394,8 +394,6 @@ DEFAULT_LINUX_BOOT_ENV \
> * add mass storage support and for gadget we add both RNDIS ethernet
> * and DFU.
> */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> #define CONFIG_AM335X_USB0
> #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
> diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
> index 2dadcae..1f57334 100644
> --- a/include/configs/brppt1.h
> +++ b/include/configs/brppt1.h
> @@ -210,8 +210,6 @@ MMCARGS
> #endif /* CONFIG_NAND */
>
> /* USB configuration */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> #define CONFIG_AM335X_USB0
> #define CONFIG_AM335X_USB0_MODE MUSB_HOST
> diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
> index 8f92d7a..09042d4 100644
> --- a/include/configs/brxre1.h
> +++ b/include/configs/brxre1.h
> @@ -80,8 +80,6 @@ BUR_COMMON_ENV \
> #define CONFIG_INITRD_TAG
>
> /* USB configuration */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> #define CONFIG_AM335X_USB0
> #define CONFIG_AM335X_USB0_MODE MUSB_HOST
> diff --git a/include/configs/chiliboard.h
> b/include/configs/chiliboard.h
> index 92fd235..89740ba 100644
> --- a/include/configs/chiliboard.h
> +++ b/include/configs/chiliboard.h
> @@ -152,9 +152,7 @@
> /* NAND: SPL related configs */
>
> /* USB configuration */
> -#define CONFIG_USB_MUSB_DSPS
> #define CONFIG_ARCH_MISC_INIT
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> #define CONFIG_AM335X_USB1
> #define CONFIG_AM335X_USB1_MODE MUSB_HOST
> diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
> index a472b9f..f263e62 100644
> --- a/include/configs/cm_t3517.h
> +++ b/include/configs/cm_t3517.h
> @@ -78,14 +78,11 @@
> 115200}
>
> /* USB */
> -#define CONFIG_USB_MUSB_AM35X
>
> #ifndef CONFIG_USB_MUSB_AM35X
> #define CONFIG_USB_OMAP3
> #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_PIO_ONLY
> #endif /* CONFIG_USB_MUSB_AM35X */
>
> /* commands to include */
> diff --git a/include/configs/kc1.h b/include/configs/kc1.h
> index 8d8dc26..94c3d0a 100644
> --- a/include/configs/kc1.h
> +++ b/include/configs/kc1.h
> @@ -115,9 +115,6 @@
> * USB gadget
> */
>
> -#define CONFIG_USB_MUSB_PIO_ONLY
> -#define CONFIG_USB_MUSB_OMAP2PLUS
> -
> /*
> * Environment
> */
> diff --git a/include/configs/omap3_beagle.h
> b/include/configs/omap3_beagle.h
> index 394bfb7..f21a843 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -43,8 +43,6 @@
> #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}}
>
> /* USB */
> -#define CONFIG_USB_MUSB_OMAP2PLUS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_TWL4030_USB 1
>
> /* USB EHCI */
> diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
> index 42f2153..0eefb84 100644
> --- a/include/configs/omap3_evm.h
> +++ b/include/configs/omap3_evm.h
> @@ -77,8 +77,6 @@
>
> /* MUSB */
> #define CONFIG_USB_OMAP3
> -#define CONFIG_USB_MUSB_OMAP2PLUS
> -#define CONFIG_USB_MUSB_PIO_ONLY
>
> /* USB EHCI */
> #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
> diff --git a/include/configs/omap3_logic.h
> b/include/configs/omap3_logic.h
> index b095814..1e4e42a 100644
> --- a/include/configs/omap3_logic.h
> +++ b/include/configs/omap3_logic.h
> @@ -55,8 +55,6 @@
> #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM
> AT24C64 */
>
> /* USB */
> -#define CONFIG_USB_MUSB_OMAP2PLUS
> -#define CONFIG_USB_MUSB_PIO_ONLY
>
> /* TWL4030 */
> #define CONFIG_TWL4030_USB
> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> index 79f3f48..c6ff1e1 100644
> --- a/include/configs/pcm051.h
> +++ b/include/configs/pcm051.h
> @@ -126,8 +126,6 @@
> /*
> * USB configuration
> */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #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 8afd64e..d9a50ca 100644
> --- a/include/configs/pengwyn.h
> +++ b/include/configs/pengwyn.h
> @@ -162,8 +162,6 @@
> * board schematic and physical port wired to each. Then for host we
> * add mass storage support.
> */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> #define CONFIG_AM335X_USB0
> #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
> diff --git a/include/configs/pic32mzdask.h
> b/include/configs/pic32mzdask.h
> index 97636fe..0bb5126 100644
> --- a/include/configs/pic32mzdask.h
> +++ b/include/configs/pic32mzdask.h
> @@ -80,7 +80,6 @@
> /*--------------------------------------------------
> * USB Configuration
> */
> -#define CONFIG_USB_MUSB_PIO_ONLY
>
> /*-------------------------------------------------------------------
> ----
> * File System Configuration
> diff --git a/include/configs/siemens-am33x-common.h
> b/include/configs/siemens-am33x-common.h
> index 78708a2..85b6412 100644
> --- a/include/configs/siemens-am33x-common.h
> +++ b/include/configs/siemens-am33x-common.h
> @@ -168,8 +168,6 @@
> /*
> * USB configuration
> */
> -#define CONFIG_USB_MUSB_DSPS
> -#define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
>
> #define CONFIG_AM335X_USB0
> diff --git a/include/configs/sniper.h b/include/configs/sniper.h
> index 5809942..09b5a73 100644
> --- a/include/configs/sniper.h
> +++ b/include/configs/sniper.h
> @@ -113,8 +113,6 @@
> * USB gadget
> */
>
> -#define CONFIG_USB_MUSB_PIO_ONLY
> -#define CONFIG_USB_MUSB_OMAP2PLUS
> #define CONFIG_TWL4030_USB
>
> /*
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-
> common.h
> index 3855c56..582aba2 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -302,10 +302,6 @@ extern int soft_i2c_gpio_scl;
> #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
> #endif
>
> -#ifdef CONFIG_USB_MUSB_SUNXI
> -#define CONFIG_USB_MUSB_PIO_ONLY
> -#endif
> -
> #ifdef CONFIG_USB_MUSB_GADGET
> #define CONFIG_USB_FUNCTION_MASS_STORAGE
> #endif
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt
> index 43a4ff0..7ff11c5 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -4943,12 +4943,8 @@ CONFIG_USB_HOST_XHCI_BASE
> CONFIG_USB_INVENTRA_DMA
> CONFIG_USB_ISP1301_I2C_ADDR
> CONFIG_USB_MAX_CONTROLLER_COUNT
> -CONFIG_USB_MUSB_AM35X
> CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
> -CONFIG_USB_MUSB_DSPS
> CONFIG_USB_MUSB_HCD
> -CONFIG_USB_MUSB_OMAP2PLUS
> -CONFIG_USB_MUSB_PIO_ONLY
> CONFIG_USB_MUSB_TIMEOUT
> CONFIG_USB_MUSB_TUSB6010
> CONFIG_USB_MUSB_UDC
--
Paul Kocialkowski,
developer of free digital technology and hardware support.
Website: https://www.paulk.fr/
Coding blog: https://code.paulk.fr/
Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171229/dc140744/attachment.sig>
More information about the U-Boot
mailing list