From cb33ca7a2a5052bdb7b479ae2af5169360625962 Mon Sep 17 00:00:00 2001 From: Sherry Sun Date: Fri, 26 Jul 2019 21:22:54 -0400 Subject: [PATCH] MLK-22336-4 imx8mm/8mn: configs: Move CONFIG_CI_UDC For imx8mm/8mn, the CONFIG_CI_UDC is defined in include/configs/imx8m*.h, which leads to CONFIG_CI_UDC can not been enabled in Kconfig, and CONFIG_DM_USB_GADGET which we need selected by CONFIG_CI_UDC in Kconfig also can not work. So move CONFIG_CI_UDC to defconfig files. The CONFIG_USB_GADGET_DUALSPEED is selected by CONFIG_CI_UDC in Kconfig files too, so we don't need it to be defined in include/configs/imx8m*.h files. Signed-off-by: Sherry Sun Reviewed-by: Ye Li --- configs/imx8mm_ddr3l_val_defconfig | 1 + configs/imx8mm_ddr4_evk_android_defconfig | 1 + configs/imx8mm_ddr4_evk_android_uuu_defconfig | 1 + configs/imx8mm_ddr4_evk_defconfig | 1 + configs/imx8mm_ddr4_evk_nand_defconfig | 1 + configs/imx8mm_ddr4_val_defconfig | 1 + configs/imx8mm_evk_1g_ddr_android_defconfig | 1 + configs/imx8mm_evk_4g_android_defconfig | 1 + configs/imx8mm_evk_4g_android_trusty_defconfig | 1 + configs/imx8mm_evk_4g_android_uuu_defconfig | 1 + configs/imx8mm_evk_android_defconfig | 1 + configs/imx8mm_evk_android_trusty_defconfig | 1 + configs/imx8mm_evk_android_uuu_defconfig | 1 + configs/imx8mm_evk_defconfig | 1 + configs/imx8mm_evk_fspi_defconfig | 1 + configs/imx8mn_ddr4_evk_android_defconfig | 1 + configs/imx8mn_ddr4_evk_android_trusty_defconfig | 1 + configs/imx8mn_ddr4_evk_android_uuu_defconfig | 1 + configs/imx8mn_ddr4_evk_defconfig | 1 + configs/imx8mn_ddr4_evk_nom_defconfig | 1 + include/configs/imx8mm_evk.h | 3 --- include/configs/imx8mm_val.h | 3 --- include/configs/imx8mn_evk.h | 3 --- 23 files changed, 20 insertions(+), 9 deletions(-) diff --git a/configs/imx8mm_ddr3l_val_defconfig b/configs/imx8mm_ddr3l_val_defconfig index 71bcd50fbc..a2e8ddb32b 100644 --- a/configs/imx8mm_ddr3l_val_defconfig +++ b/configs/imx8mm_ddr3l_val_defconfig @@ -56,6 +56,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/imx8mm_ddr4_evk_android_defconfig b/configs/imx8mm_ddr4_evk_android_defconfig index 0ead29e928..cec3e4d677 100755 --- a/configs/imx8mm_ddr4_evk_android_defconfig +++ b/configs/imx8mm_ddr4_evk_android_defconfig @@ -56,6 +56,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_ddr4_evk_android_uuu_defconfig b/configs/imx8mm_ddr4_evk_android_uuu_defconfig index d6e5300483..815f32c9f2 100755 --- a/configs/imx8mm_ddr4_evk_android_uuu_defconfig +++ b/configs/imx8mm_ddr4_evk_android_uuu_defconfig @@ -56,6 +56,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_ddr4_evk_defconfig b/configs/imx8mm_ddr4_evk_defconfig index 546121731f..97f2e993fb 100644 --- a/configs/imx8mm_ddr4_evk_defconfig +++ b/configs/imx8mm_ddr4_evk_defconfig @@ -57,6 +57,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mm_ddr4_evk_nand_defconfig b/configs/imx8mm_ddr4_evk_nand_defconfig index eb9384aa09..14288b8b83 100644 --- a/configs/imx8mm_ddr4_evk_nand_defconfig +++ b/configs/imx8mm_ddr4_evk_nand_defconfig @@ -55,6 +55,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mm_ddr4_val_defconfig b/configs/imx8mm_ddr4_val_defconfig index 2a1d94a805..aadc017757 100644 --- a/configs/imx8mm_ddr4_val_defconfig +++ b/configs/imx8mm_ddr4_val_defconfig @@ -61,6 +61,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mm_evk_1g_ddr_android_defconfig b/configs/imx8mm_evk_1g_ddr_android_defconfig index 4367710a12..3c221d90f2 100755 --- a/configs/imx8mm_evk_1g_ddr_android_defconfig +++ b/configs/imx8mm_evk_1g_ddr_android_defconfig @@ -56,6 +56,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_evk_4g_android_defconfig b/configs/imx8mm_evk_4g_android_defconfig index aec744e2d2..66b9851d53 100755 --- a/configs/imx8mm_evk_4g_android_defconfig +++ b/configs/imx8mm_evk_4g_android_defconfig @@ -55,6 +55,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_evk_4g_android_trusty_defconfig b/configs/imx8mm_evk_4g_android_trusty_defconfig index 8f24826ab0..8624f2dd2f 100755 --- a/configs/imx8mm_evk_4g_android_trusty_defconfig +++ b/configs/imx8mm_evk_4g_android_trusty_defconfig @@ -55,6 +55,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_evk_4g_android_uuu_defconfig b/configs/imx8mm_evk_4g_android_uuu_defconfig index 66e0404af1..89a11bbf6a 100755 --- a/configs/imx8mm_evk_4g_android_uuu_defconfig +++ b/configs/imx8mm_evk_4g_android_uuu_defconfig @@ -56,6 +56,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_evk_android_defconfig b/configs/imx8mm_evk_android_defconfig index 6fe46c4ca1..435f49f58f 100644 --- a/configs/imx8mm_evk_android_defconfig +++ b/configs/imx8mm_evk_android_defconfig @@ -55,6 +55,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_evk_android_trusty_defconfig b/configs/imx8mm_evk_android_trusty_defconfig index c5217deffb..a2a53cc512 100755 --- a/configs/imx8mm_evk_android_trusty_defconfig +++ b/configs/imx8mm_evk_android_trusty_defconfig @@ -55,6 +55,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_evk_android_uuu_defconfig b/configs/imx8mm_evk_android_uuu_defconfig index 08b35fe97c..59288e06de 100755 --- a/configs/imx8mm_evk_android_uuu_defconfig +++ b/configs/imx8mm_evk_android_uuu_defconfig @@ -56,6 +56,7 @@ CONFIG_NXP_TMU=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_LZ4=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index 95f382a430..7331552d82 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -70,6 +70,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mm_evk_fspi_defconfig b/configs/imx8mm_evk_fspi_defconfig index 47e052a7b6..daa87f542b 100644 --- a/configs/imx8mm_evk_fspi_defconfig +++ b/configs/imx8mm_evk_fspi_defconfig @@ -70,6 +70,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig index ec13edd39f..9640372d6d 100644 --- a/configs/imx8mn_ddr4_evk_android_defconfig +++ b/configs/imx8mn_ddr4_evk_android_defconfig @@ -72,6 +72,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mn_ddr4_evk_android_trusty_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_defconfig index c9bc61dd1a..833153cc78 100644 --- a/configs/imx8mn_ddr4_evk_android_trusty_defconfig +++ b/configs/imx8mn_ddr4_evk_android_trusty_defconfig @@ -71,6 +71,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mn_ddr4_evk_android_uuu_defconfig b/configs/imx8mn_ddr4_evk_android_uuu_defconfig index a0d484edef..3157570333 100644 --- a/configs/imx8mn_ddr4_evk_android_uuu_defconfig +++ b/configs/imx8mn_ddr4_evk_android_uuu_defconfig @@ -72,6 +72,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 1f278226c9..8b38fa35d5 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -70,6 +70,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/imx8mn_ddr4_evk_nom_defconfig b/configs/imx8mn_ddr4_evk_nom_defconfig index 7e0ace007f..cb8c885f8d 100644 --- a/configs/imx8mn_ddr4_evk_nom_defconfig +++ b/configs/imx8mn_ddr4_evk_nom_defconfig @@ -69,6 +69,7 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_DM_USB=y +CONFIG_CI_UDC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 1e71264d1f..4a1fbb11d1 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -342,11 +342,8 @@ #endif -#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_CI_UDC - #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/imx8mm_val.h b/include/configs/imx8mm_val.h index 89b8637892..d06af09cfa 100644 --- a/include/configs/imx8mm_val.h +++ b/include/configs/imx8mm_val.h @@ -294,11 +294,8 @@ #endif -#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_CI_UDC - #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 084bdb77bf..ac91d5b11c 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -312,11 +312,8 @@ #endif -#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_CI_UDC - #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -- 2.17.1