[U-Boot] [PATCH 1/3] Convert CONFIG_TWL4030_USB to Kconfig

Adam Ford aford173 at gmail.com
Tue Jan 2 16:38:36 UTC 2018


This converts the following to Kconfig:
   CONFIG_TWL4030_USB

Signed-off-by: Adam Ford <aford173 at gmail.com>
---
 configs/cm_t35_defconfig         |  1 +
 configs/igep0032_defconfig       |  2 ++
 configs/igep00x0_defconfig       |  2 ++
 configs/nokia_rx51_defconfig     |  2 ++
 configs/omap3_beagle_defconfig   |  1 +
 configs/omap3_logic_defconfig    |  1 +
 configs/omap3_zoom1_defconfig    |  2 ++
 configs/sniper_defconfig         |  1 +
 drivers/usb/Kconfig              |  2 ++
 drivers/usb/phy/Kconfig          | 12 ++++++++++++
 include/configs/cm_t35.h         |  1 -
 include/configs/nokia_rx51.h     |  1 -
 include/configs/omap3_beagle.h   |  1 -
 include/configs/omap3_igep00x0.h |  1 -
 include/configs/omap3_logic.h    |  1 -
 include/configs/omap3_zoom1.h    |  1 -
 include/configs/sniper.h         |  1 -
 scripts/config_whitelist.txt     |  1 -
 18 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index c61a93b..ef15ef6 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -50,6 +50,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_TWL4030_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index e394aa5..7145a70 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -39,6 +39,8 @@ CONFIG_SMC911X_BASE=0x2C000000
 CONFIG_SMC911X_32_BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
+CONFIG_USB=y
+CONFIG_TWL4030_USB=y
 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index d70d4c6..5b391a9 100644
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -40,6 +40,8 @@ CONFIG_SMC911X_BASE=0x2C000000
 CONFIG_SMC911X_32_BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
+CONFIG_USB=y
+CONFIG_TWL4030_USB=y
 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 9057811..058e920 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_FAT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
+CONFIG_USB=y
+CONFIG_TWL4030_USB=y
 CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE_ANSI=y
 # CONFIG_VGA_AS_SINGLE_DEVICE is not set
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index ad72079..f8f173e 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_TWL4030_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index db72e6f..b20ed10 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_TWL4030_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index 6639c7e..5a94378 100644
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -41,5 +41,7 @@ CONFIG_SMC911X_BASE=0x08000000
 CONFIG_SMC911X_32_BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
+CONFIG_USB=y
+CONFIG_TWL4030_USB=y
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index a8a592f..b5d4757 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_TWL4030_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index e7658b4..af897fd 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -55,6 +55,8 @@ source "drivers/usb/musb-new/Kconfig"
 
 source "drivers/usb/emul/Kconfig"
 
+source "drivers/usb/phy/Kconfig"
+
 source "drivers/usb/ulpi/Kconfig"
 
 comment "USB peripherals"
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
new file mode 100644
index 0000000..943a966
--- /dev/null
+++ b/drivers/usb/phy/Kconfig
@@ -0,0 +1,12 @@
+#
+# (C) Copyright 2017
+# Adam Ford, Logic PD, aford173 at gmail.com
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+comment "USB Phy"
+
+config TWL4030_USB
+	bool "TWL4030 PHY"
+
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index dc1b6b5..7afbd63 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -74,7 +74,6 @@
 /* USB */
 #define CONFIG_USB_OMAP3
 #define CONFIG_USB_MUSB_UDC
-#define CONFIG_TWL4030_USB
 
 /* USB device configuration */
 #define CONFIG_USB_DEVICE
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index b7fe734..f984888 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -86,7 +86,6 @@
 #define CONFIG_USB_MUSB_UDC
 #define CONFIG_USB_MUSB_HCD
 #define CONFIG_USB_OMAP3
-#define CONFIG_TWL4030_USB
 
 /* USB device configuration */
 #define CONFIG_USB_DEVICE
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 394bfb7..2b0b71b 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -45,7 +45,6 @@
 /* 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_igep00x0.h b/include/configs/omap3_igep00x0.h
index 91b3a23..4f64c10 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -44,7 +44,6 @@
 /* USB */
 #define CONFIG_USB_MUSB_UDC		1
 #define CONFIG_USB_OMAP3		1
-#define CONFIG_TWL4030_USB		1
 
 /* USB device configuration */
 #define CONFIG_USB_DEVICE		1
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index b095814..0004b77 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -59,7 +59,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 
 /* TWL4030 */
-#define CONFIG_TWL4030_USB
 
 /* Board NAND Info. */
 #ifdef CONFIG_NAND
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index d1ff48d..e8f9434 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -37,7 +37,6 @@
 /* USB */
 #define CONFIG_USB_MUSB_UDC			1
 #define CONFIG_USB_OMAP3		1
-#define CONFIG_TWL4030_USB		1
 
 /* USB device configuration */
 #define CONFIG_USB_DEVICE		1
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 5809942..9b83f35 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -115,7 +115,6 @@
 
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_TWL4030_USB
 
 /*
  * Environment
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 43a4ff0..6dfb6d8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4814,7 +4814,6 @@ CONFIG_TUXX1
 CONFIG_TWL4030_INPUT
 CONFIG_TWL4030_KEYPAD
 CONFIG_TWL4030_LED
-CONFIG_TWL4030_USB
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_POWER
 CONFIG_TWR
-- 
2.7.4



More information about the U-Boot mailing list