Convert CONFIG_AM335X_USB0 et al to Kconfig

This converts the following to Kconfig:
   CONFIG_AM335X_USB0
   CONFIG_AM335X_USB0_MODE
   CONFIG_AM335X_USB1
   CONFIG_AM335X_USB1_MODE

We do this by introducing specific options for static configuration of
USB0/USB1 in SPL rather than defining CONFIG_AM335X_USBx_MODE to the
enum value being used.  Furthermore, with how the code is used now we do
not need to have OTG mode exposed as an option here, so remove that.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 1402376915eaf50f801d46d58020c1f828baa52e..b8e115dc92bfca9596ff29ac8870bf30eec196e5 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -280,3 +280,35 @@ config PUB_ROM_DATA_SIZE
          image, this area is no longer used, and can be reclaimed
          for run time use by the boot image.
 endif
+
+config AM335X_USB0
+       bool "Static mode configuration for USB0 in SPL"
+       depends on AM33XX && SPL_MUSB_NEW && !SPL_OF_CONTROL
+
+choice
+       prompt "USB0 port configuration"
+       depends on AM335X_USB0
+
+config AM335X_USB0_HOST
+       bool "Port is used in host mode"
+
+config AM335X_USB0_PERIPHERAL
+       bool "Port is used in peripheral mode"
+
+endchoice
+
+config AM335X_USB1
+       bool "Static mode configuration for USB1 in SPL"
+       depends on AM33XX && SPL_MUSB_NEW && !SPL_OF_CONTROL
+
+choice
+       prompt "USB1 port configuration"
+       depends on AM335X_USB1
+
+config AM335X_USB1_HOST
+       bool "Port is used in host mode"
+
+config AM335X_USB1_PERIPHERAL
+       bool "Port is used in peripheral mode"
+
+endchoice

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index bcc907ce36263601b7cf2cdee40ed7d5ecfe5755..5175eb01cbe9a0eb05407ca7462ef075f9d47568 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -241,14 +241,14 @@ static struct ti_musb_plat usb1 = {
 };
 
 U_BOOT_DRVINFOS(am33xx_usbs) = {
-#if CONFIG_AM335X_USB0_MODE == MUSB_PERIPHERAL
+#ifdef CONFIG_AM335X_USB0_PERIPHERAL
        { "ti-musb-peripheral", &usb0 },
-#elif CONFIG_AM335X_USB0_MODE == MUSB_HOST
+#elif defined(CONFIG_AM335X_USB0_HOST)
        { "ti-musb-host", &usb0 },
 #endif
-#if CONFIG_AM335X_USB1_MODE == MUSB_PERIPHERAL
+#ifdef CONFIG_AM335X_USB1_PERIPHERAL
        { "ti-musb-peripheral", &usb1 },
-#elif CONFIG_AM335X_USB1_MODE == MUSB_HOST
+#elif defined(CONFIG_AM335X_USB1_HOST)
        { "ti-musb-host", &usb1 },
 #endif
 };

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 535b269076cf2d974b90d9b9706491eadf0c1c23..497127d4065b68d12a08a4b047b80a102a32a633 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -4,6 +4,9 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_AM33XX=y
+CONFIG_AM335X_USB0=y
+CONFIG_AM335X_USB0_PERIPHERAL=y
+CONFIG_AM335X_USB1=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_TIMESTAMP=y

diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig
index ca3d01aea4298b93e0fb4296c8f04d2bf39735a1..f8cc073c2329aa8466a7a70793f2a189664d1a07 100644 (file)
--- a/configs/am335x_guardian_defconfig
+++ b/configs/am335x_guardian_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0x500000
 CONFIG_DEFAULT_DEVICE_TREE="am335x-guardian"
 CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_GUARDIAN=y
+CONFIG_AM335X_USB0=y
+CONFIG_AM335X_USB0_PERIPHERAL=y
+CONFIG_AM335X_USB1=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 9070845b7a644b9fdee5aa9fe336f3ca5cf44fe4..4db04ff54e7e899467ea8608956430cb5b3ac9a5 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -201,18 +201,6 @@
  * in memory.
  */
 
-/*
- * USB configuration.  We enable MUSB support, both for host and for
- * gadget.  We set USB0 as peripheral and USB1 as host, based on the
- * board schematic and physical port wired to each.  Then for host we
- * add mass storage support and for gadget we add both RNDIS ethernet
- * and DFU.
- */
-#define CONFIG_AM335X_USB0
-#define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL
-#define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-
 /*
  * Disable MMC DM for SPL build and can be re-enabled after adding
  * DM support in SPL

diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index 10a95a10a0eb2ef15ce8440291be19aa80bd4ef4..608a22db4442e51aacd50c12e996b70e567ccd0f 100644 (file)
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -129,9 +129,4 @@
 
 #endif /* CONFIG_MTD_RAW_NAND */
 
-#define CONFIG_AM335X_USB0
-#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
-#define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-
 #endif /* ! __CONFIG_AM335X_GUARDIAN_H */

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index f4ab6640cdc8521ae34ec6620b4bee051a679ef7..b881d8c03fd777a15ae160643d7f578ff738e6f5 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -214,18 +214,6 @@
 #endif
 #endif
 
-/*
- * USB configuration.  We enable MUSB support, both for host and for
- * gadget.  We set USB0 as peripheral and USB1 as host, based on the
- * board schematic and physical port wired to each.  Then for host we
- * add mass storage support and for gadget we add both RNDIS ethernet
- * and DFU.
- */
-#define CONFIG_AM335X_USB0
-#define CONFIG_AM335X_USB0_MODE        MUSB_HOST
-#define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_OTG
-
 /* NAND support */
 #ifdef CONFIG_MTD_RAW_NAND
 #define GPMC_NAND_ECC_LP_x8_LAYOUT     1

diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index fe496272630d41249d0b32439933fea53a10896c..aa2a07e910f8b75b615207383ce167775dfde3fc 100644 (file)
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -127,10 +127,6 @@
 #define CONFIG_SYS_NAND_ECCBYTES       14
 /* NAND: SPL related configs */
 
-/* USB configuration */
-#define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-
 /*
  * Disable MMC DM for SPL build and can be re-enabled after adding
  * DM support in SPL

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index c3a04c2f65a62a9c1b6e99863bc452667f1731ec..bfadf4a6b861ca71d43992f2092a8ca02ff06e45 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -104,13 +104,6 @@
  */
 
 #ifndef CONFIG_SPL_BUILD
-/*
- * USB configuration
- */
-#define CONFIG_AM335X_USB0
-#define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL
-#define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_HOST
 
 /* USB DRACO ID as default */
 #define CONFIG_USBD_HS