Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 80f1f3204a6e1bacede4b80d23470200872ed438

Authored by Tom Rini
1 parent 64d6ac5bc4
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Kconfig: USB: Migrate existing USB_EHCI_xxx options 

The following options are migrated over fully now:
- USB_EHCI_ATMEL
- USB_EHCI_MARVELL
- USB_EHCI_MX6
- USB_EHCI_MX7
- USB_EHCI_MSM
- USB_EHCI_ZYNQ
- USB_EHCI_GENERIC

This also requires fixing the depends on USB_EHCI_MARVELL as it's used
by Orion5X and Kirkwood as well.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Marek Vasut <marex@denx.de>

Showing 38 changed files with 2 additions and 39 deletions Side-by-side Diff

arch/arm/mach-kirkwood/include/mach/config.h
Diff comments   View file @ 80f1f32
... ... @@ -89,7 +89,6 @@
89 89 * USB/EHCI
90 90 */
91 91 #ifdef CONFIG_CMD_USB
92   -#define CONFIG_USB_EHCI_MARVELL
93 92 #define CONFIG_EHCI_IS_TDI
94 93 #endif /* CONFIG_CMD_USB */
95 94  
drivers/usb/host/Kconfig
Diff comments   View file @ 80f1f32
... ... @@ -85,8 +85,8 @@
85 85 Enables support for the on-chip EHCI controller on Atmel chips.
86 86  
87 87 config USB_EHCI_MARVELL
88   - bool "Support for MVEBU (AXP / A38x) on-chip EHCI USB controller"
89   - depends on ARCH_MVEBU
  88 + bool "Support for Marvell on-chip EHCI USB controller"
  89 + depends on ARCH_MVEBU || KIRKWOOD || ORION5X
90 90 default y
91 91 ---help---
92 92 Enables support for the on-chip EHCI controller on MVEBU SoCs.
include/configs/advantech_dms-ba16.h
Diff comments   View file @ 80f1f32
... ... @@ -55,7 +55,6 @@
55 55 #define CONFIG_BOUNCE_BUFFER
56 56  
57 57 /* USB Configs */
58   -#define CONFIG_USB_EHCI_MX6
59 58 #define CONFIG_USB_STORAGE
60 59 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
61 60 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/aristainetos-common.h
Diff comments   View file @ 80f1f32
... ... @@ -202,7 +202,6 @@
202 202 #define CONFIG_RTC_M41T11
203 203  
204 204 /* USB Configs */
205   -#define CONFIG_USB_EHCI_MX6
206 205 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
207 206 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
208 207 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/cgtqmx6eval.h
Diff comments   View file @ 80f1f32
... ... @@ -61,7 +61,6 @@
61 61 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
62 62  
63 63 /* USB Configs */
64   -#define CONFIG_USB_EHCI_MX6
65 64 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
66 65 #define CONFIG_USB_HOST_ETHER
67 66 #define CONFIG_USB_ETHER_ASIX
include/configs/corvus.h
Diff comments   View file @ 80f1f32
... ... @@ -96,7 +96,6 @@
96 96 #define CONFIG_AT91_WANTS_COMMON_PHY
97 97  
98 98 /* USB */
99   -#define CONFIG_USB_EHCI_ATMEL
100 99 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
101 100  
102 101 /* USB DFU support */
include/configs/ds414.h
Diff comments   View file @ 80f1f32
... ... @@ -74,7 +74,6 @@
74 74 #endif
75 75  
76 76 #if !defined(CONFIG_USB_XHCI_HCD)
77   -#define CONFIG_USB_EHCI_MARVELL
78 77 #define CONFIG_EHCI_IS_TDI
79 78 #endif
80 79  
include/configs/edminiv2.h
Diff comments   View file @ 80f1f32
... ... @@ -171,7 +171,6 @@
171 171 * Common USB/EHCI configuration
172 172 */
173 173 #ifdef CONFIG_CMD_USB
174   -#define CONFIG_USB_EHCI_MARVELL
175 174 #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
176 175 #define CONFIG_SUPPORT_VFAT
177 176 #endif /* CONFIG_CMD_USB */
include/configs/embestmx6boards.h
Diff comments   View file @ 80f1f32
... ... @@ -35,7 +35,6 @@
35 35 #define CONFIG_SYS_I2C_SPEED 100000
36 36  
37 37 /* USB Configs */
38   -#define CONFIG_USB_EHCI_MX6
39 38 #define CONFIG_USB_HOST_ETHER
40 39 #define CONFIG_USB_ETHER_ASIX
41 40 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
include/configs/ge_bx50v3.h
Diff comments   View file @ 80f1f32
... ... @@ -68,7 +68,6 @@
68 68  
69 69 /* USB Configs */
70 70 #ifdef CONFIG_USB
71   -#define CONFIG_USB_EHCI_MX6
72 71 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
73 72 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
74 73 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/gw_ventana.h
Diff comments   View file @ 80f1f32
... ... @@ -156,7 +156,6 @@
156 156 #define CONFIG_ARP_TIMEOUT 200UL
157 157  
158 158 /* USB Configs */
159   -#define CONFIG_USB_EHCI_MX6
160 159 #define CONFIG_USB_HOST_ETHER
161 160 #define CONFIG_USB_ETHER_ASIX
162 161 #define CONFIG_USB_ETHER_SMSC95XX
include/configs/liteboard.h
Diff comments   View file @ 80f1f32
... ... @@ -137,7 +137,6 @@
137 137  
138 138 /* USB Configs */
139 139 #ifdef CONFIG_CMD_USB
140   -#define CONFIG_USB_EHCI_MX6
141 140 #define CONFIG_USB_STORAGE
142 141 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
143 142 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/ma5d4evk.h
Diff comments   View file @ 80f1f32
... ... @@ -102,7 +102,6 @@
102 102 * USB
103 103 */
104 104 #ifdef CONFIG_CMD_USB
105   -#define CONFIG_USB_EHCI_ATMEL
106 105 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
107 106  
108 107 /* USB device */
include/configs/mccmon6.h
Diff comments   View file @ 80f1f32
... ... @@ -98,7 +98,6 @@
98 98 "128k@0x19C0000(swupdate-kernel-dtb.nor)"
99 99  
100 100 /* USB Configs */
101   -#define CONFIG_USB_EHCI_MX6
102 101 #define CONFIG_USB_STORAGE
103 102 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
104 103 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/mx6cuboxi.h
Diff comments   View file @ 80f1f32
... ... @@ -44,7 +44,6 @@
44 44 #define CONFIG_IMX_VIDEO_SKIP
45 45  
46 46 /* USB */
47   -#define CONFIG_USB_EHCI_MX6
48 47 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
49 48 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
50 49 #define CONFIG_MXC_USB_FLAGS 0
include/configs/mx6qarm2.h
Diff comments   View file @ 80f1f32
... ... @@ -128,7 +128,6 @@
128 128  
129 129 /* USB Configs */
130 130 #ifdef CONFIG_CMD_USB
131   -#define CONFIG_USB_EHCI_MX6
132 131 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
133 132 #define CONFIG_USB_HOST_ETHER
134 133 #define CONFIG_USB_ETHER_ASIX
include/configs/mx6qsabreauto.h
Diff comments   View file @ 80f1f32
... ... @@ -15,7 +15,6 @@
15 15 #define CONFIG_MMCROOT "/dev/mmcblk0p2"
16 16  
17 17 /* USB Configs */
18   -#define CONFIG_USB_EHCI_MX6
19 18 #define CONFIG_USB_HOST_ETHER
20 19 #define CONFIG_USB_ETHER_ASIX
21 20 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
include/configs/mx6sabresd.h
Diff comments   View file @ 80f1f32
... ... @@ -63,7 +63,6 @@
63 63  
64 64 /* USB Configs */
65 65 #ifdef CONFIG_CMD_USB
66   -#define CONFIG_USB_EHCI_MX6
67 66 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
68 67 #define CONFIG_USB_HOST_ETHER
69 68 #define CONFIG_USB_ETHER_ASIX
include/configs/mx6slevk.h
Diff comments   View file @ 80f1f32
... ... @@ -159,7 +159,6 @@
159 159  
160 160 /* USB Configs */
161 161 #ifdef CONFIG_CMD_USB
162   -#define CONFIG_USB_EHCI_MX6
163 162 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
164 163 #define CONFIG_USB_HOST_ETHER
165 164 #define CONFIG_USB_ETHER_ASIX
include/configs/mx6sxsabreauto.h
Diff comments   View file @ 80f1f32
... ... @@ -149,7 +149,6 @@
149 149 #define CONFIG_PHY_ATHEROS
150 150  
151 151 #ifdef CONFIG_CMD_USB
152   -#define CONFIG_USB_EHCI_MX6
153 152 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
154 153 #define CONFIG_USB_HOST_ETHER
155 154 #define CONFIG_USB_ETHER_ASIX
include/configs/mx6sxsabresd.h
Diff comments   View file @ 80f1f32
... ... @@ -167,7 +167,6 @@
167 167 #define CONFIG_PHY_ATHEROS
168 168  
169 169 #ifdef CONFIG_CMD_USB
170   -#define CONFIG_USB_EHCI_MX6
171 170 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
172 171 #define CONFIG_USB_HOST_ETHER
173 172 #define CONFIG_USB_ETHER_ASIX
include/configs/mx6ul_14x14_evk.h
Diff comments   View file @ 80f1f32
... ... @@ -186,7 +186,6 @@
186 186  
187 187 /* USB Configs */
188 188 #ifdef CONFIG_CMD_USB
189   -#define CONFIG_USB_EHCI_MX6
190 189 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
191 190 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
192 191 #define CONFIG_MXC_USB_FLAGS 0
include/configs/nitrogen6x.h
Diff comments   View file @ 80f1f32
... ... @@ -74,7 +74,6 @@
74 74 #define CONFIG_PHY_MICREL_KSZ9021
75 75  
76 76 /* USB Configs */
77   -#define CONFIG_USB_EHCI_MX6
78 77 #define CONFIG_USB_HOST_ETHER
79 78 #define CONFIG_USB_ETHER_ASIX
80 79 #define CONFIG_USB_ETHER_MCS7830
include/configs/novena.h
Diff comments   View file @ 80f1f32
... ... @@ -135,7 +135,6 @@
135 135  
136 136 /* USB Configs */
137 137 #ifdef CONFIG_CMD_USB
138   -#define CONFIG_USB_EHCI_MX6
139 138 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
140 139 #define CONFIG_USB_HOST_ETHER
141 140 #define CONFIG_USB_ETHER_ASIX
include/configs/ot1200.h
Diff comments   View file @ 80f1f32
... ... @@ -55,7 +55,6 @@
55 55 #define CONFIG_SYS_FSL_USDHC_NUM 2
56 56  
57 57 /* USB Configs */
58   -#define CONFIG_USB_EHCI_MX6
59 58 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
60 59 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
61 60  
include/configs/pico-imx6ul.h
Diff comments   View file @ 80f1f32
... ... @@ -37,7 +37,6 @@
37 37 #define CONFIG_SUPPORT_EMMC_BOOT
38 38  
39 39 /* USB Configs */
40   -#define CONFIG_USB_EHCI_MX6
41 40 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
42 41 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
43 42 #define CONFIG_MXC_USB_FLAGS 0
include/configs/picosam9g45.h
Diff comments   View file @ 80f1f32
... ... @@ -98,7 +98,6 @@
98 98 #define CONFIG_AT91_WANTS_COMMON_PHY
99 99  
100 100 /* USB */
101   -#define CONFIG_USB_EHCI_ATMEL
102 101 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
103 102  
104 103 #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
include/configs/platinum.h
Diff comments   View file @ 80f1f32
... ... @@ -52,7 +52,6 @@
52 52 #define CONFIG_PHYLIB
53 53  
54 54 /* USB config */
55   -#define CONFIG_USB_EHCI_MX6
56 55 #define CONFIG_MXC_USB_PORT 1
57 56 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
58 57 #define CONFIG_MXC_USB_FLAGS 0
include/configs/sama5d2_ptc.h
Diff comments   View file @ 80f1f32
... ... @@ -66,7 +66,6 @@
66 66 #define CONFIG_CMD_USB
67 67  
68 68 #ifdef CONFIG_CMD_USB
69   -#define CONFIG_USB_EHCI_ATMEL
70 69 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
71 70 #endif
72 71  
include/configs/snapper9g45.h
Diff comments   View file @ 80f1f32
... ... @@ -61,7 +61,6 @@
61 61 #define CONFIG_TFTP_TSIZE
62 62  
63 63 /* USB */
64   -#define CONFIG_USB_EHCI_ATMEL
65 64 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
66 65  
67 66 /* MMC */
include/configs/tbs2910.h
Diff comments   View file @ 80f1f32
... ... @@ -93,7 +93,6 @@
93 93  
94 94 /* USB */
95 95 #ifdef CONFIG_CMD_USB
96   -#define CONFIG_USB_EHCI_MX6
97 96 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
98 97 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
99 98 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/titanium.h
Diff comments   View file @ 80f1f32
... ... @@ -50,7 +50,6 @@
50 50 #define CONFIG_PHY_MICREL_KSZ9021
51 51  
52 52 /* USB Configs */
53   -#define CONFIG_USB_EHCI_MX6
54 53 #define CONFIG_MXC_USB_PORT 1
55 54 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
56 55 #define CONFIG_MXC_USB_FLAGS 0
include/configs/tqma6.h
Diff comments   View file @ 80f1f32
... ... @@ -81,7 +81,6 @@
81 81 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
82 82  
83 83 /* USB Configs */
84   -#define CONFIG_USB_EHCI_MX6
85 84 #define CONFIG_USB_HOST_ETHER
86 85 #define CONFIG_USB_ETHER_SMSC95XX
87 86 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/vinco.h
Diff comments   View file @ 80f1f32
... ... @@ -66,7 +66,6 @@
66 66 /* USB */
67 67  
68 68 #ifdef CONFIG_CMD_USB
69   -#define CONFIG_USB_EHCI_ATMEL
70 69 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
71 70 #endif
72 71  
include/configs/vining_2000.h
Diff comments   View file @ 80f1f32
... ... @@ -76,7 +76,6 @@
76 76 #define CONFIG_PHY_ATHEROS
77 77  
78 78 #ifdef CONFIG_CMD_USB
79   -#define CONFIG_USB_EHCI_MX6
80 79 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
81 80 #define CONFIG_USB_HOST_ETHER
82 81 #define CONFIG_USB_ETHER_ASIX
include/configs/wandboard.h
Diff comments   View file @ 80f1f32
... ... @@ -50,7 +50,6 @@
50 50 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
51 51  
52 52 /* USB Configs */
53   -#define CONFIG_USB_EHCI_MX6
54 53 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
55 54 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
56 55 #define CONFIG_MXC_USB_FLAGS 0
include/configs/warp.h
Diff comments   View file @ 80f1f32
... ... @@ -58,7 +58,6 @@
58 58  
59 59 /* USB Configs */
60 60 #ifdef CONFIG_CMD_USB
61   -#define CONFIG_USB_EHCI_MX6
62 61 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
63 62 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
64 63 #define CONFIG_MXC_USB_FLAGS 0
include/configs/xpress.h
Diff comments   View file @ 80f1f32
... ... @@ -64,7 +64,6 @@
64 64 #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */
65 65  
66 66 /* USB Configs */
67   -#define CONFIG_USB_EHCI_MX6
68 67 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
69 68 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
70 69 #define CONFIG_MXC_USB_FLAGS 0