diff options
author | Simon Guinot <simon.guinot@sequanux.org> | 2013-04-08 18:41:27 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-10 14:15:42 -0400 |
commit | a557dd1a08dfb5baff4eb1704ed22fd839205057 (patch) | |
tree | 64471b0ac3eda14e940bde41b37bc1d8f0e0ecc9 /arch/arm/mach-kirkwood | |
parent | c52af91db35a3082ba1d3b0a14a6ff9410244200 (diff) |
ARM: Kirkwood: sort board entries by ASCII-code order
This patch sorts board entries in files Kconfig, Makefile and
kirkwood_defconfig by ASCII-code order.
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 314 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/Makefile | 40 |
2 files changed, 178 insertions, 176 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 3fd07ebcb126..938395a871f9 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig | |||
@@ -2,23 +2,41 @@ if ARCH_KIRKWOOD | |||
2 | 2 | ||
3 | menu "Marvell Kirkwood Implementations" | 3 | menu "Marvell Kirkwood Implementations" |
4 | 4 | ||
5 | config MACH_D2NET_V2 | ||
6 | bool "LaCie d2 Network v2 NAS Board" | ||
7 | help | ||
8 | Say 'Y' here if you want your kernel to support the | ||
9 | LaCie d2 Network v2 NAS. | ||
10 | |||
5 | config MACH_DB88F6281_BP | 11 | config MACH_DB88F6281_BP |
6 | bool "Marvell DB-88F6281-BP Development Board" | 12 | bool "Marvell DB-88F6281-BP Development Board" |
7 | help | 13 | help |
8 | Say 'Y' here if you want your kernel to support the | 14 | Say 'Y' here if you want your kernel to support the |
9 | Marvell DB-88F6281-BP Development Board. | 15 | Marvell DB-88F6281-BP Development Board. |
10 | 16 | ||
11 | config MACH_RD88F6192_NAS | 17 | config MACH_DOCKSTAR |
12 | bool "Marvell RD-88F6192-NAS Reference Board" | 18 | bool "Seagate FreeAgent DockStar" |
13 | help | 19 | help |
14 | Say 'Y' here if you want your kernel to support the | 20 | Say 'Y' here if you want your kernel to support the |
15 | Marvell RD-88F6192-NAS Reference Board. | 21 | Seagate FreeAgent DockStar. |
16 | 22 | ||
17 | config MACH_RD88F6281 | 23 | config MACH_ESATA_SHEEVAPLUG |
18 | bool "Marvell RD-88F6281 Reference Board" | 24 | bool "Marvell eSATA SheevaPlug Reference Board" |
19 | help | 25 | help |
20 | Say 'Y' here if you want your kernel to support the | 26 | Say 'Y' here if you want your kernel to support the |
21 | Marvell RD-88F6281 Reference Board. | 27 | Marvell eSATA SheevaPlug Reference Board. |
28 | |||
29 | config MACH_GURUPLUG | ||
30 | bool "Marvell GuruPlug Reference Board" | ||
31 | help | ||
32 | Say 'Y' here if you want your kernel to support the | ||
33 | Marvell GuruPlug Reference Board. | ||
34 | |||
35 | config MACH_INETSPACE_V2 | ||
36 | bool "LaCie Internet Space v2 NAS Board" | ||
37 | help | ||
38 | Say 'Y' here if you want your kernel to support the | ||
39 | LaCie Internet Space v2 NAS. | ||
22 | 40 | ||
23 | config MACH_MV88F6281GTW_GE | 41 | config MACH_MV88F6281GTW_GE |
24 | bool "Marvell 88F6281 GTW GE Board" | 42 | bool "Marvell 88F6281 GTW GE Board" |
@@ -26,23 +44,93 @@ config MACH_MV88F6281GTW_GE | |||
26 | Say 'Y' here if you want your kernel to support the | 44 | Say 'Y' here if you want your kernel to support the |
27 | Marvell 88F6281 GTW GE Board. | 45 | Marvell 88F6281 GTW GE Board. |
28 | 46 | ||
47 | config MACH_NET2BIG_V2 | ||
48 | bool "LaCie 2Big Network v2 NAS Board" | ||
49 | help | ||
50 | Say 'Y' here if you want your kernel to support the | ||
51 | LaCie 2Big Network v2 NAS. | ||
52 | |||
53 | config MACH_NET5BIG_V2 | ||
54 | bool "LaCie 5Big Network v2 NAS Board" | ||
55 | help | ||
56 | Say 'Y' here if you want your kernel to support the | ||
57 | LaCie 5Big Network v2 NAS. | ||
58 | |||
59 | config MACH_NETSPACE_MAX_V2 | ||
60 | bool "LaCie Network Space Max v2 NAS Board" | ||
61 | help | ||
62 | Say 'Y' here if you want your kernel to support the | ||
63 | LaCie Network Space Max v2 NAS. | ||
64 | |||
65 | config MACH_NETSPACE_V2 | ||
66 | bool "LaCie Network Space v2 NAS Board" | ||
67 | help | ||
68 | Say 'Y' here if you want your kernel to support the | ||
69 | LaCie Network Space v2 NAS. | ||
70 | |||
71 | config MACH_OPENRD | ||
72 | bool | ||
73 | |||
74 | config MACH_OPENRD_BASE | ||
75 | bool "Marvell OpenRD Base Board" | ||
76 | select MACH_OPENRD | ||
77 | help | ||
78 | Say 'Y' here if you want your kernel to support the | ||
79 | Marvell OpenRD Base Board. | ||
80 | |||
81 | config MACH_OPENRD_CLIENT | ||
82 | bool "Marvell OpenRD Client Board" | ||
83 | select MACH_OPENRD | ||
84 | help | ||
85 | Say 'Y' here if you want your kernel to support the | ||
86 | Marvell OpenRD Client Board. | ||
87 | |||
88 | config MACH_OPENRD_ULTIMATE | ||
89 | bool "Marvell OpenRD Ultimate Board" | ||
90 | select MACH_OPENRD | ||
91 | help | ||
92 | Say 'Y' here if you want your kernel to support the | ||
93 | Marvell OpenRD Ultimate Board. | ||
94 | |||
95 | config MACH_RD88F6192_NAS | ||
96 | bool "Marvell RD-88F6192-NAS Reference Board" | ||
97 | help | ||
98 | Say 'Y' here if you want your kernel to support the | ||
99 | Marvell RD-88F6192-NAS Reference Board. | ||
100 | |||
101 | config MACH_RD88F6281 | ||
102 | bool "Marvell RD-88F6281 Reference Board" | ||
103 | help | ||
104 | Say 'Y' here if you want your kernel to support the | ||
105 | Marvell RD-88F6281 Reference Board. | ||
106 | |||
29 | config MACH_SHEEVAPLUG | 107 | config MACH_SHEEVAPLUG |
30 | bool "Marvell SheevaPlug Reference Board" | 108 | bool "Marvell SheevaPlug Reference Board" |
31 | help | 109 | help |
32 | Say 'Y' here if you want your kernel to support the | 110 | Say 'Y' here if you want your kernel to support the |
33 | Marvell SheevaPlug Reference Board. | 111 | Marvell SheevaPlug Reference Board. |
34 | 112 | ||
35 | config MACH_ESATA_SHEEVAPLUG | 113 | config MACH_T5325 |
36 | bool "Marvell eSATA SheevaPlug Reference Board" | 114 | bool "HP t5325 Thin Client" |
37 | help | 115 | help |
38 | Say 'Y' here if you want your kernel to support the | 116 | Say 'Y' here if you want your kernel to support the |
39 | Marvell eSATA SheevaPlug Reference Board. | 117 | HP t5325 Thin Client. |
40 | 118 | ||
41 | config MACH_GURUPLUG | 119 | config MACH_TS219 |
42 | bool "Marvell GuruPlug Reference Board" | 120 | bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS" |
43 | help | 121 | help |
44 | Say 'Y' here if you want your kernel to support the | 122 | Say 'Y' here if you want your kernel to support the |
45 | Marvell GuruPlug Reference Board. | 123 | QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and |
124 | TS-219P+ Turbo NAS devices. | ||
125 | |||
126 | config MACH_TS41X | ||
127 | bool "QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS" | ||
128 | help | ||
129 | Say 'Y' here if you want your kernel to support the | ||
130 | QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo | ||
131 | NAS devices. | ||
132 | |||
133 | comment "Device tree entries" | ||
46 | 134 | ||
47 | config ARCH_KIRKWOOD_DT | 135 | config ARCH_KIRKWOOD_DT |
48 | bool "Marvell Kirkwood Flattened Device Tree" | 136 | bool "Marvell Kirkwood Flattened Device Tree" |
@@ -58,12 +146,20 @@ config ARCH_KIRKWOOD_DT | |||
58 | Say 'Y' here if you want your kernel to support the | 146 | Say 'Y' here if you want your kernel to support the |
59 | Marvell Kirkwood using flattened device tree. | 147 | Marvell Kirkwood using flattened device tree. |
60 | 148 | ||
61 | config MACH_GURUPLUG_DT | 149 | config MACH_DLINK_KIRKWOOD_DT |
62 | bool "Marvell GuruPlug Reference Board (Flattened Device Tree)" | 150 | bool "D-Link Kirkwood-based NAS (Flattened Device Tree)" |
63 | select ARCH_KIRKWOOD_DT | 151 | select ARCH_KIRKWOOD_DT |
64 | help | 152 | help |
65 | Say 'Y' here if you want your kernel to support the | 153 | Say 'Y' here if you want your kernel to support the |
66 | Marvell GuruPlug Reference Board (Flattened Device Tree). | 154 | Kirkwood-based D-Link NASes such as DNS-320 & DNS-325, |
155 | using Flattened Device Tree. | ||
156 | |||
157 | config MACH_DOCKSTAR_DT | ||
158 | bool "Seagate FreeAgent Dockstar (Flattened Device Tree)" | ||
159 | select ARCH_KIRKWOOD_DT | ||
160 | help | ||
161 | Say 'Y' here if you want your kernel to support the | ||
162 | Seagate FreeAgent Dockstar (Flattened Device Tree). | ||
67 | 163 | ||
68 | config MACH_DREAMPLUG_DT | 164 | config MACH_DREAMPLUG_DT |
69 | bool "Marvell DreamPlug (Flattened Device Tree)" | 165 | bool "Marvell DreamPlug (Flattened Device Tree)" |
@@ -72,19 +168,19 @@ config MACH_DREAMPLUG_DT | |||
72 | Say 'Y' here if you want your kernel to support the | 168 | Say 'Y' here if you want your kernel to support the |
73 | Marvell DreamPlug (Flattened Device Tree). | 169 | Marvell DreamPlug (Flattened Device Tree). |
74 | 170 | ||
75 | config MACH_ICONNECT_DT | 171 | config MACH_GOFLEXNET_DT |
76 | bool "Iomega Iconnect (Flattened Device Tree)" | 172 | bool "Seagate GoFlex Net (Flattened Device Tree)" |
77 | select ARCH_KIRKWOOD_DT | 173 | select ARCH_KIRKWOOD_DT |
78 | help | 174 | help |
79 | Say 'Y' here to enable Iomega Iconnect support. | 175 | Say 'Y' here if you want your kernel to support the |
176 | Seagate GoFlex Net (Flattened Device Tree). | ||
80 | 177 | ||
81 | config MACH_DLINK_KIRKWOOD_DT | 178 | config MACH_GURUPLUG_DT |
82 | bool "D-Link Kirkwood-based NAS (Flattened Device Tree)" | 179 | bool "Marvell GuruPlug Reference Board (Flattened Device Tree)" |
83 | select ARCH_KIRKWOOD_DT | 180 | select ARCH_KIRKWOOD_DT |
84 | help | 181 | help |
85 | Say 'Y' here if you want your kernel to support the | 182 | Say 'Y' here if you want your kernel to support the |
86 | Kirkwood-based D-Link NASes such as DNS-320 & DNS-325, | 183 | Marvell GuruPlug Reference Board (Flattened Device Tree). |
87 | using Flattened Device Tree. | ||
88 | 184 | ||
89 | config MACH_IB62X0_DT | 185 | config MACH_IB62X0_DT |
90 | bool "RaidSonic IB-NAS6210, IB-NAS6220 (Flattened Device Tree)" | 186 | bool "RaidSonic IB-NAS6210, IB-NAS6220 (Flattened Device Tree)" |
@@ -94,41 +190,18 @@ config MACH_IB62X0_DT | |||
94 | RaidSonic IB-NAS6210 & IB-NAS6220 devices, using | 190 | RaidSonic IB-NAS6210 & IB-NAS6220 devices, using |
95 | Flattened Device Tree. | 191 | Flattened Device Tree. |
96 | 192 | ||
97 | config MACH_TS219_DT | 193 | config MACH_ICONNECT_DT |
98 | bool "Device Tree for QNAP TS-11X, TS-21X NAS" | 194 | bool "Iomega Iconnect (Flattened Device Tree)" |
99 | select ARCH_KIRKWOOD_DT | ||
100 | select ARM_APPENDED_DTB | ||
101 | select ARM_ATAG_DTB_COMPAT | ||
102 | help | ||
103 | Say 'Y' here if you want your kernel to support the QNAP | ||
104 | TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and | ||
105 | TS-219P+ Turbo NAS devices using Fattened Device Tree. | ||
106 | There are two different Device Tree descriptions, depending | ||
107 | on if the device is based on an if the board uses the MV6281 | ||
108 | or MV6282. If you have the wrong one, the buttons will not | ||
109 | work. | ||
110 | |||
111 | config MACH_DOCKSTAR_DT | ||
112 | bool "Seagate FreeAgent Dockstar (Flattened Device Tree)" | ||
113 | select ARCH_KIRKWOOD_DT | ||
114 | help | ||
115 | Say 'Y' here if you want your kernel to support the | ||
116 | Seagate FreeAgent Dockstar (Flattened Device Tree). | ||
117 | |||
118 | config MACH_GOFLEXNET_DT | ||
119 | bool "Seagate GoFlex Net (Flattened Device Tree)" | ||
120 | select ARCH_KIRKWOOD_DT | 195 | select ARCH_KIRKWOOD_DT |
121 | help | 196 | help |
122 | Say 'Y' here if you want your kernel to support the | 197 | Say 'Y' here to enable Iomega Iconnect support. |
123 | Seagate GoFlex Net (Flattened Device Tree). | ||
124 | 198 | ||
125 | config MACH_LSXL_DT | 199 | config MACH_INETSPACE_V2_DT |
126 | bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)" | 200 | bool "LaCie Internet Space v2 NAS (Flattened Device Tree)" |
127 | select ARCH_KIRKWOOD_DT | 201 | select ARCH_KIRKWOOD_DT |
128 | help | 202 | help |
129 | Say 'Y' here if you want your kernel to support the | 203 | Say 'Y' here if you want your kernel to support the LaCie |
130 | Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using | 204 | Internet Space v2 NAS, using Flattened Device Tree. |
131 | Flattened Device Tree. | ||
132 | 205 | ||
133 | config MACH_IOMEGA_IX2_200_DT | 206 | config MACH_IOMEGA_IX2_200_DT |
134 | bool "Iomega StorCenter ix2-200 (Flattened Device Tree)" | 207 | bool "Iomega StorCenter ix2-200 (Flattened Device Tree)" |
@@ -144,12 +217,13 @@ config MACH_KM_KIRKWOOD_DT | |||
144 | Say 'Y' here if you want your kernel to support the | 217 | Say 'Y' here if you want your kernel to support the |
145 | Keymile Kirkwood Reference Desgin, using Flattened Device Tree. | 218 | Keymile Kirkwood Reference Desgin, using Flattened Device Tree. |
146 | 219 | ||
147 | config MACH_INETSPACE_V2_DT | 220 | config MACH_LSXL_DT |
148 | bool "LaCie Internet Space v2 NAS (Flattened Device Tree)" | 221 | bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)" |
149 | select ARCH_KIRKWOOD_DT | 222 | select ARCH_KIRKWOOD_DT |
150 | help | 223 | help |
151 | Say 'Y' here if you want your kernel to support the LaCie | 224 | Say 'Y' here if you want your kernel to support the |
152 | Internet Space v2 NAS, using Flattened Device Tree. | 225 | Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using |
226 | Flattened Device Tree. | ||
153 | 227 | ||
154 | config MACH_MPLCEC4_DT | 228 | config MACH_MPLCEC4_DT |
155 | bool "MPL CEC4 (Flattened Device Tree)" | 229 | bool "MPL CEC4 (Flattened Device Tree)" |
@@ -158,12 +232,12 @@ config MACH_MPLCEC4_DT | |||
158 | Say 'Y' here if you want your kernel to support the | 232 | Say 'Y' here if you want your kernel to support the |
159 | MPL CEC4 (Flattened Device Tree). | 233 | MPL CEC4 (Flattened Device Tree). |
160 | 234 | ||
161 | config MACH_NETSPACE_V2_DT | 235 | config MACH_NETSPACE_LITE_V2_DT |
162 | bool "LaCie Network Space v2 NAS (Flattened Device Tree)" | 236 | bool "LaCie Network Space Lite v2 NAS (Flattened Device Tree)" |
163 | select ARCH_KIRKWOOD_DT | 237 | select ARCH_KIRKWOOD_DT |
164 | help | 238 | help |
165 | Say 'Y' here if you want your kernel to support the LaCie | 239 | Say 'Y' here if you want your kernel to support the LaCie |
166 | Network Space v2 NAS, using Flattened Device Tree. | 240 | Network Space Lite v2 NAS, using Flattened Device Tree. |
167 | 241 | ||
168 | config MACH_NETSPACE_MAX_V2_DT | 242 | config MACH_NETSPACE_MAX_V2_DT |
169 | bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)" | 243 | bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)" |
@@ -172,13 +246,6 @@ config MACH_NETSPACE_MAX_V2_DT | |||
172 | Say 'Y' here if you want your kernel to support the LaCie | 246 | Say 'Y' here if you want your kernel to support the LaCie |
173 | Network Space Max v2 NAS, using Flattened Device Tree. | 247 | Network Space Max v2 NAS, using Flattened Device Tree. |
174 | 248 | ||
175 | config MACH_NETSPACE_LITE_V2_DT | ||
176 | bool "LaCie Network Space Lite v2 NAS (Flattened Device Tree)" | ||
177 | select ARCH_KIRKWOOD_DT | ||
178 | help | ||
179 | Say 'Y' here if you want your kernel to support the LaCie | ||
180 | Network Space Lite v2 NAS, using Flattened Device Tree. | ||
181 | |||
182 | config MACH_NETSPACE_MINI_V2_DT | 249 | config MACH_NETSPACE_MINI_V2_DT |
183 | bool "LaCie Network Space Mini v2 NAS (Flattened Device Tree)" | 250 | bool "LaCie Network Space Mini v2 NAS (Flattened Device Tree)" |
184 | select ARCH_KIRKWOOD_DT | 251 | select ARCH_KIRKWOOD_DT |
@@ -187,6 +254,21 @@ config MACH_NETSPACE_MINI_V2_DT | |||
187 | Network Space Mini v2 NAS (aka SafeBox), using Flattened | 254 | Network Space Mini v2 NAS (aka SafeBox), using Flattened |
188 | Device Tree. | 255 | Device Tree. |
189 | 256 | ||
257 | config MACH_NETSPACE_V2_DT | ||
258 | bool "LaCie Network Space v2 NAS (Flattened Device Tree)" | ||
259 | select ARCH_KIRKWOOD_DT | ||
260 | help | ||
261 | Say 'Y' here if you want your kernel to support the LaCie | ||
262 | Network Space v2 NAS, using Flattened Device Tree. | ||
263 | |||
264 | config MACH_NSA310_DT | ||
265 | bool "ZyXEL NSA-310 (Flattened Device Tree)" | ||
266 | select ARCH_KIRKWOOD_DT | ||
267 | select ARM_ATAG_DTB_COMPAT | ||
268 | help | ||
269 | Say 'Y' here if you want your kernel to support the | ||
270 | ZyXEL NSA-310 board (Flattened Device Tree). | ||
271 | |||
190 | config MACH_OPENBLOCKS_A6_DT | 272 | config MACH_OPENBLOCKS_A6_DT |
191 | bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)" | 273 | bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)" |
192 | select ARCH_KIRKWOOD_DT | 274 | select ARCH_KIRKWOOD_DT |
@@ -210,99 +292,19 @@ config MACH_TOPKICK_DT | |||
210 | Say 'Y' here if you want your kernel to support the | 292 | Say 'Y' here if you want your kernel to support the |
211 | USI Topkick, using Flattened Device Tree | 293 | USI Topkick, using Flattened Device Tree |
212 | 294 | ||
213 | config MACH_TS219 | 295 | config MACH_TS219_DT |
214 | bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS" | 296 | bool "Device Tree for QNAP TS-11X, TS-21X NAS" |
215 | help | ||
216 | Say 'Y' here if you want your kernel to support the | ||
217 | QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and | ||
218 | TS-219P+ Turbo NAS devices. | ||
219 | |||
220 | config MACH_TS41X | ||
221 | bool "QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS" | ||
222 | help | ||
223 | Say 'Y' here if you want your kernel to support the | ||
224 | QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo | ||
225 | NAS devices. | ||
226 | |||
227 | config MACH_DOCKSTAR | ||
228 | bool "Seagate FreeAgent DockStar" | ||
229 | help | ||
230 | Say 'Y' here if you want your kernel to support the | ||
231 | Seagate FreeAgent DockStar. | ||
232 | |||
233 | config MACH_OPENRD | ||
234 | bool | ||
235 | |||
236 | config MACH_OPENRD_BASE | ||
237 | bool "Marvell OpenRD Base Board" | ||
238 | select MACH_OPENRD | ||
239 | help | ||
240 | Say 'Y' here if you want your kernel to support the | ||
241 | Marvell OpenRD Base Board. | ||
242 | |||
243 | config MACH_OPENRD_CLIENT | ||
244 | bool "Marvell OpenRD Client Board" | ||
245 | select MACH_OPENRD | ||
246 | help | ||
247 | Say 'Y' here if you want your kernel to support the | ||
248 | Marvell OpenRD Client Board. | ||
249 | |||
250 | config MACH_OPENRD_ULTIMATE | ||
251 | bool "Marvell OpenRD Ultimate Board" | ||
252 | select MACH_OPENRD | ||
253 | help | ||
254 | Say 'Y' here if you want your kernel to support the | ||
255 | Marvell OpenRD Ultimate Board. | ||
256 | |||
257 | config MACH_NETSPACE_V2 | ||
258 | bool "LaCie Network Space v2 NAS Board" | ||
259 | help | ||
260 | Say 'Y' here if you want your kernel to support the | ||
261 | LaCie Network Space v2 NAS. | ||
262 | |||
263 | config MACH_INETSPACE_V2 | ||
264 | bool "LaCie Internet Space v2 NAS Board" | ||
265 | help | ||
266 | Say 'Y' here if you want your kernel to support the | ||
267 | LaCie Internet Space v2 NAS. | ||
268 | |||
269 | config MACH_NETSPACE_MAX_V2 | ||
270 | bool "LaCie Network Space Max v2 NAS Board" | ||
271 | help | ||
272 | Say 'Y' here if you want your kernel to support the | ||
273 | LaCie Network Space Max v2 NAS. | ||
274 | |||
275 | config MACH_D2NET_V2 | ||
276 | bool "LaCie d2 Network v2 NAS Board" | ||
277 | help | ||
278 | Say 'Y' here if you want your kernel to support the | ||
279 | LaCie d2 Network v2 NAS. | ||
280 | |||
281 | config MACH_NET2BIG_V2 | ||
282 | bool "LaCie 2Big Network v2 NAS Board" | ||
283 | help | ||
284 | Say 'Y' here if you want your kernel to support the | ||
285 | LaCie 2Big Network v2 NAS. | ||
286 | |||
287 | config MACH_NET5BIG_V2 | ||
288 | bool "LaCie 5Big Network v2 NAS Board" | ||
289 | help | ||
290 | Say 'Y' here if you want your kernel to support the | ||
291 | LaCie 5Big Network v2 NAS. | ||
292 | |||
293 | config MACH_T5325 | ||
294 | bool "HP t5325 Thin Client" | ||
295 | help | ||
296 | Say 'Y' here if you want your kernel to support the | ||
297 | HP t5325 Thin Client. | ||
298 | |||
299 | config MACH_NSA310_DT | ||
300 | bool "ZyXEL NSA-310 (Flattened Device Tree)" | ||
301 | select ARCH_KIRKWOOD_DT | 297 | select ARCH_KIRKWOOD_DT |
298 | select ARM_APPENDED_DTB | ||
302 | select ARM_ATAG_DTB_COMPAT | 299 | select ARM_ATAG_DTB_COMPAT |
303 | help | 300 | help |
304 | Say 'Y' here if you want your kernel to support the | 301 | Say 'Y' here if you want your kernel to support the QNAP |
305 | ZyXEL NSA-310 board (Flattened Device Tree). | 302 | TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and |
303 | TS-219P+ Turbo NAS devices using Fattened Device Tree. | ||
304 | There are two different Device Tree descriptions, depending | ||
305 | on if the device is based on an if the board uses the MV6281 | ||
306 | or MV6282. If you have the wrong one, the buttons will not | ||
307 | work. | ||
306 | 308 | ||
307 | endmenu | 309 | endmenu |
308 | 310 | ||
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile index ff0f3cb7b4e3..5f1285d216ac 100644 --- a/arch/arm/mach-kirkwood/Makefile +++ b/arch/arm/mach-kirkwood/Makefile | |||
@@ -1,43 +1,43 @@ | |||
1 | obj-y += common.o addr-map.o irq.o pcie.o mpp.o | 1 | obj-y += common.o addr-map.o irq.o pcie.o mpp.o |
2 | 2 | ||
3 | obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o | ||
3 | obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o | 4 | obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o |
4 | obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o | 5 | obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o |
5 | obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o | ||
6 | obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o | ||
7 | obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o | ||
8 | obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o | 6 | obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o |
9 | obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o | 7 | obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o |
10 | obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o | ||
11 | obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o | ||
12 | obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o | ||
13 | obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o | ||
14 | obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o | ||
15 | obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o | 8 | obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o |
16 | obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o | 9 | obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o |
17 | obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o | ||
18 | obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o | 10 | obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o |
19 | obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o | 11 | obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o |
12 | obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o | ||
13 | obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o | ||
14 | obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o | ||
15 | obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o | ||
16 | obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o | ||
17 | obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o | ||
20 | obj-$(CONFIG_MACH_T5325) += t5325-setup.o | 18 | obj-$(CONFIG_MACH_T5325) += t5325-setup.o |
19 | obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o | ||
20 | obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o | ||
21 | 21 | ||
22 | obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o | 22 | obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o |
23 | obj-$(CONFIG_MACH_DREAMPLUG_DT) += board-dreamplug.o | ||
24 | obj-$(CONFIG_MACH_GURUPLUG_DT) += board-guruplug.o | ||
25 | obj-$(CONFIG_MACH_ICONNECT_DT) += board-iconnect.o | ||
26 | obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o | 23 | obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o |
27 | obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o | ||
28 | obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o | ||
29 | obj-$(CONFIG_MACH_DOCKSTAR_DT) += board-dockstar.o | 24 | obj-$(CONFIG_MACH_DOCKSTAR_DT) += board-dockstar.o |
25 | obj-$(CONFIG_MACH_DREAMPLUG_DT) += board-dreamplug.o | ||
30 | obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o | 26 | obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o |
31 | obj-$(CONFIG_MACH_LSXL_DT) += board-lsxl.o | 27 | obj-$(CONFIG_MACH_GURUPLUG_DT) += board-guruplug.o |
28 | obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o | ||
29 | obj-$(CONFIG_MACH_ICONNECT_DT) += board-iconnect.o | ||
30 | obj-$(CONFIG_MACH_INETSPACE_V2_DT) += board-ns2.o | ||
32 | obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += board-iomega_ix2_200.o | 31 | obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += board-iomega_ix2_200.o |
33 | obj-$(CONFIG_MACH_KM_KIRKWOOD_DT) += board-km_kirkwood.o | 32 | obj-$(CONFIG_MACH_KM_KIRKWOOD_DT) += board-km_kirkwood.o |
34 | obj-$(CONFIG_MACH_INETSPACE_V2_DT) += board-ns2.o | 33 | obj-$(CONFIG_MACH_LSXL_DT) += board-lsxl.o |
35 | obj-$(CONFIG_MACH_MPLCEC4_DT) += board-mplcec4.o | 34 | obj-$(CONFIG_MACH_MPLCEC4_DT) += board-mplcec4.o |
36 | obj-$(CONFIG_MACH_NETSPACE_V2_DT) += board-ns2.o | ||
37 | obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT) += board-ns2.o | ||
38 | obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT) += board-ns2.o | 35 | obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT) += board-ns2.o |
36 | obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT) += board-ns2.o | ||
39 | obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT) += board-ns2.o | 37 | obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT) += board-ns2.o |
38 | obj-$(CONFIG_MACH_NETSPACE_V2_DT) += board-ns2.o | ||
40 | obj-$(CONFIG_MACH_NSA310_DT) += board-nsa310.o | 39 | obj-$(CONFIG_MACH_NSA310_DT) += board-nsa310.o |
41 | obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT) += board-openblocks_a6.o | 40 | obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT) += board-openblocks_a6.o |
42 | obj-$(CONFIG_MACH_READYNAS_DT) += board-readynas.o | 41 | obj-$(CONFIG_MACH_READYNAS_DT) += board-readynas.o |
43 | obj-$(CONFIG_MACH_TOPKICK_DT) += board-usi_topkick.o | 42 | obj-$(CONFIG_MACH_TOPKICK_DT) += board-usi_topkick.o |
43 | obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o | ||