This converts the following to Kconfig: CONFIG_HAS_FSL_DR_USB
Signed-off-by: Tom Rini trini@konsulko.com --- board/freescale/common/Kconfig | 4 ++++ board/freescale/p1_p2_rdb_pc/Kconfig | 2 ++ include/configs/MPC837XERDB.h | 2 -- include/configs/P1010RDB.h | 2 -- include/configs/P2041RDB.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 3 --- include/configs/T208xRDB.h | 3 --- include/configs/T4240RDB.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/ids8313.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - 13 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig index 6553bf63bfd5..c13c865fd1f1 100644 --- a/board/freescale/common/Kconfig +++ b/board/freescale/common/Kconfig @@ -107,3 +107,7 @@ config QIXIS_I2C_ACCESS bool "Access to QIXIS is over i2c" depends on FSL_QIXIS default y + +config HAS_FSL_DR_USB + def_bool y + depends on USB_EHCI_HCD && PPC diff --git a/board/freescale/p1_p2_rdb_pc/Kconfig b/board/freescale/p1_p2_rdb_pc/Kconfig index cd36150f6377..db7b47a4635b 100644 --- a/board/freescale/p1_p2_rdb_pc/Kconfig +++ b/board/freescale/p1_p2_rdb_pc/Kconfig @@ -11,4 +11,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "p1_p2_rdb_pc"
+source "board/freescale/common/Kconfig" + endif diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 01e62668fa52..4995bcee856d 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -306,8 +306,6 @@ * Environment Configuration */
-#define CONFIG_HAS_FSL_DR_USB - #define CONFIG_NETDEV "eth1"
#define CONFIG_HOSTNAME "mpc837x_rdb" diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 3773b125327c..d5b8cfaea397 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -490,8 +490,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif
-#define CONFIG_HAS_FSL_DR_USB - /* * Environment */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index dfe92bcea099..261e9872a7a1 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -376,7 +376,6 @@ /* * USB */ -#define CONFIG_HAS_FSL_DR_USB #define CONFIG_HAS_FSL_MPH_USB
#ifdef CONFIG_MMC diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 43cf604fdd5c..b412438116df 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -399,7 +399,6 @@ /* * USB */ -#define CONFIG_HAS_FSL_DR_USB
/* * SDHC diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index da0a4f206ef5..bb05b2ed7c98 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -403,7 +403,6 @@ /* * USB */ -#define CONFIG_HAS_FSL_DR_USB
#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index dfe9192df128..e46488b3c0ed 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -474,9 +474,6 @@ /* * USB */ -#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_HAS_FSL_DR_USB -#endif
/* * SDHC diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index a5a30d8c8555..d4bf938ac6f6 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -430,9 +430,6 @@ /* * USB */ -#ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_HAS_FSL_DR_USB -#endif
/* * SDHC diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 7690bee48459..ebdd47edf952 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -448,7 +448,6 @@ /* * USB */ -#define CONFIG_HAS_FSL_DR_USB
#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 54e79b16d653..ce9e51170582 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -374,7 +374,6 @@ /* * USB */ -#define CONFIG_HAS_FSL_DR_USB #define CONFIG_HAS_FSL_MPH_USB
#ifdef CONFIG_MMC diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 39a36779bc4a..aa6a471cc254 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -182,7 +182,6 @@ #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) #define CONFIG_SYS_NS16550_CLK (get_bus_freq(0))
-#define CONFIG_HAS_FSL_DR_USB #define CONFIG_SYS_SCCR_USBDRCM 3
/* diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 76b46cab4cd8..41009cb6a3b8 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -456,7 +456,6 @@ /* * USB */ -#define CONFIG_HAS_FSL_DR_USB
#if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_USB_MAX_CONTROLLER_COUNT 1