1 --- a/arch/arm/tools/mach-types
2 +++ b/arch/arm/tools/mach-types
5 # http://www.arm.linux.org.uk/developer/machines/?action=new
7 -# Last update: Sun Dec 12 23:24:27 2010
8 +# Last update: Wed Dec 29 19:22:02 2010
10 # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
12 @@ -1319,7 +1319,7 @@ mistral MACH_MISTRAL MISTRAL 1315
14 ct5910 MACH_CT5910 CT5910 1317
15 ct5912 MACH_CT5912 CT5912 1318
16 -hynet_ine MACH_HYNET_INE HYNET_INE 1319
17 +argonst_mp MACH_HYNET_INE HYNET_INE 1319
18 hynet_app MACH_HYNET_APP HYNET_APP 1320
19 msm7200 MACH_MSM7200 MSM7200 1321
20 msm7600 MACH_MSM7600 MSM7600 1322
21 @@ -1777,7 +1777,7 @@ wdg002 MACH_WDG002 WDG002 1785
22 sg560adsl MACH_SG560ADSL SG560ADSL 1786
23 nextio_n2800_ica MACH_NEXTIO_N2800_ICA NEXTIO_N2800_ICA 1787
24 dove_db MACH_DOVE_DB DOVE_DB 1788
25 -marvell_newdb MACH_MARVELL_NEWDB MARVELL_NEWDB 1789
26 +dove_avng MACH_MARVELL_NEWDB MARVELL_NEWDB 1789
27 vandihud MACH_VANDIHUD VANDIHUD 1790
28 magx_e8 MACH_MAGX_E8 MAGX_E8 1791
29 magx_z6 MACH_MAGX_Z6 MAGX_Z6 1792
30 @@ -1877,7 +1877,7 @@ ued MACH_UED UED 1885
31 esiblade MACH_ESIBLADE ESIBLADE 1886
32 eye02 MACH_EYE02 EYE02 1887
33 imx27kbd MACH_IMX27KBD IMX27KBD 1888
34 -sst61vc010_fpga MACH_SST61VC010_FPGA SST61VC010_FPGA 1889
35 +p87_fpga MACH_SST61VC010_FPGA SST61VC010_FPGA 1889
36 kixvp435 MACH_KIXVP435 KIXVP435 1890
37 kixnp435 MACH_KIXNP435 KIXNP435 1891
38 africa MACH_AFRICA AFRICA 1892
39 @@ -2308,7 +2308,7 @@ ecac2378 MACH_ECAC2378 ECAC2378 2319
40 tazkiosk MACH_TAZKIOSK TAZKIOSK 2320
41 whiterabbit_mch MACH_WHITERABBIT_MCH WHITERABBIT_MCH 2321
42 sbox9263 MACH_SBOX9263 SBOX9263 2322
43 -oreo MACH_OREO OREO 2323
44 +oreo_camera MACH_OREO OREO 2323
45 smdk6442 MACH_SMDK6442 SMDK6442 2324
46 openrd_base MACH_OPENRD_BASE OPENRD_BASE 2325
47 incredible MACH_INCREDIBLE INCREDIBLE 2326
48 @@ -2374,7 +2374,7 @@ sch_m490 MACH_SCH_M490 SCH_M490 2386
49 rbl01 MACH_RBL01 RBL01 2387
50 omnifi MACH_OMNIFI OMNIFI 2388
51 otavalo MACH_OTAVALO OTAVALO 2389
52 -sienna MACH_SIENNA SIENNA 2390
53 +siena MACH_SIENNA SIENNA 2390
54 htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391
55 htc_opal MACH_HTC_OPAL HTC_OPAL 2392
56 touchbook MACH_TOUCHBOOK TOUCHBOOK 2393
57 @@ -2446,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1
58 siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459
59 sm3k MACH_SM3K SM3K 2460
60 acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461
61 -sst61vc010_dev MACH_SST61VC010_DEV SST61VC010_DEV 2462
62 +p87_dev MACH_SST61VC010_DEV SST61VC010_DEV 2462
63 glittertind MACH_GLITTERTIND GLITTERTIND 2463
64 omap_zoom3 MACH_OMAP_ZOOM3 OMAP_ZOOM3 2464
65 omap_3630sdp MACH_OMAP_3630SDP OMAP_3630SDP 2465
66 @@ -2498,7 +2498,7 @@ hiram MACH_HIRAM HIRAM 2510
67 phy3250 MACH_PHY3250 PHY3250 2511
68 ea3250 MACH_EA3250 EA3250 2512
69 fdi3250 MACH_FDI3250 FDI3250 2513
70 -whitestone MACH_WHITESTONE WHITESTONE 2514
71 +htcwhitestone MACH_WHITESTONE WHITESTONE 2514
72 at91sam9263nit MACH_AT91SAM9263NIT AT91SAM9263NIT 2515
73 ccmx51 MACH_CCMX51 CCMX51 2516
74 ccmx51js MACH_CCMX51JS CCMX51JS 2517
75 @@ -2561,7 +2561,7 @@ magnolia2 MACH_MAGNOLIA2 MAGNOLIA2 25
76 emxx MACH_EMXX EMXX 2574
77 outlaw MACH_OUTLAW OUTLAW 2575
78 riot_bei2 MACH_RIOT_BEI2 RIOT_BEI2 2576
79 -riot_vox MACH_RIOT_VOX RIOT_VOX 2577
80 +riot_gx2 MACH_RIOT_VOX RIOT_VOX 2577
81 riot_x37 MACH_RIOT_X37 RIOT_X37 2578
82 mega25mx MACH_MEGA25MX MEGA25MX 2579
83 benzina2 MACH_BENZINA2 BENZINA2 2580
84 @@ -2582,7 +2582,7 @@ omap3_bulldog MACH_OMAP3_BULLDOG OMAP3_
85 pca101 MACH_PCA101 PCA101 2595
86 buzzc MACH_BUZZC BUZZC 2596
87 sasie2 MACH_SASIE2 SASIE2 2597
88 -davinci_cio MACH_DAVINCI_CIO DAVINCI_CIO 2598
89 +davinci_dm6467_cio MACH_DAVINCI_CIO DAVINCI_CIO 2598
90 smartmeter_dl MACH_SMARTMETER_DL SMARTMETER_DL 2599
91 wzl6410 MACH_WZL6410 WZL6410 2600
92 wzl6410m MACH_WZL6410M WZL6410M 2601
93 @@ -2591,7 +2591,7 @@ wzl6410i MACH_WZL6410I WZL6410I 2603
94 spacecom1 MACH_SPACECOM1 SPACECOM1 2604
95 pingu920 MACH_PINGU920 PINGU920 2605
96 bravoc MACH_BRAVOC BRAVOC 2606
97 -cybo2440 MACH_CYBO2440 CYBO2440 2607
98 +mydev MACH_CYBO2440 CYBO2440 2607
99 vdssw MACH_VDSSW VDSSW 2608
100 romulus MACH_ROMULUS ROMULUS 2609
101 omap_magic MACH_OMAP_MAGIC OMAP_MAGIC 2610
102 @@ -2683,7 +2683,7 @@ lkevm MACH_LKEVM LKEVM 2695
103 mw6410 MACH_MW6410 MW6410 2696
104 terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
105 cpu8000e MACH_CPU8000E CPU8000E 2698
106 -catania MACH_CATANIA CATANIA 2699
107 +catania_s MACH_CATANIA CATANIA 2699
108 tokyo MACH_TOKYO TOKYO 2700
109 msm7201a_surf MACH_MSM7201A_SURF MSM7201A_SURF 2701
110 msm7201a_ffa MACH_MSM7201A_FFA MSM7201A_FFA 2702
111 @@ -2750,7 +2750,7 @@ h6053 MACH_H6053 H6053 2762
112 smint01 MACH_SMINT01 SMINT01 2763
113 prtlvt2 MACH_PRTLVT2 PRTLVT2 2764
114 ap420 MACH_AP420 AP420 2765
115 -htcshift MACH_HTCSHIFT HTCSHIFT 2766
116 +htcclio MACH_HTCSHIFT HTCSHIFT 2766
117 davinci_dm365_fc MACH_DAVINCI_DM365_FC DAVINCI_DM365_FC 2767
118 msm8x55_surf MACH_MSM8X55_SURF MSM8X55_SURF 2768
119 msm8x55_ffa MACH_MSM8X55_FFA MSM8X55_FFA 2769
120 @@ -2761,7 +2761,7 @@ oreo_controller MACH_OREO_CONTROLLER OR
121 kopin_models MACH_KOPIN_MODELS KOPIN_MODELS 2774
122 ttc_vision2 MACH_TTC_VISION2 TTC_VISION2 2775
123 cns3420vb MACH_CNS3420VB CNS3420VB 2776
124 -lpc2 MACH_LPC2 LPC2 2777
125 +lpc_evo MACH_LPC2 LPC2 2777
126 olympus MACH_OLYMPUS OLYMPUS 2778
127 vortex MACH_VORTEX VORTEX 2779
128 s5pc200 MACH_S5PC200 S5PC200 2780
129 @@ -2788,7 +2788,7 @@ ti8168evm MACH_TI8168EVM TI8168EVM 28
130 neocoreomap MACH_NEOCOREOMAP NEOCOREOMAP 2801
131 withings_wbp MACH_WITHINGS_WBP WITHINGS_WBP 2802
132 dbps MACH_DBPS DBPS 2803
133 -sbc9261 MACH_SBC9261 SBC9261 2804
134 +at91sam9261 MACH_SBC9261 SBC9261 2804
135 pcbfp0001 MACH_PCBFP0001 PCBFP0001 2805
136 speedy MACH_SPEEDY SPEEDY 2806
137 chrysaor MACH_CHRYSAOR CHRYSAOR 2807
138 @@ -2812,7 +2812,7 @@ p565 MACH_P565 P565 2824
139 acer_a4 MACH_ACER_A4 ACER_A4 2825
140 davinci_dm368_bip MACH_DAVINCI_DM368_BIP DAVINCI_DM368_BIP 2826
141 eshare MACH_ESHARE ESHARE 2827
142 -hw_omapl138_europa MACH_HW_OMAPL138_EUROPA HW_OMAPL138_EUROPA 2828
143 +omapl138_europa MACH_HW_OMAPL138_EUROPA HW_OMAPL138_EUROPA 2828
144 wlbargn MACH_WLBARGN WLBARGN 2829
145 bm170 MACH_BM170 BM170 2830
146 netspace_mini_v2 MACH_NETSPACE_MINI_V2 NETSPACE_MINI_V2 2831
147 @@ -2879,7 +2879,7 @@ davinci_picto MACH_DAVINCI_PICTO DAVINC
148 mecha MACH_MECHA MECHA 2892
149 bubba3 MACH_BUBBA3 BUBBA3 2893
150 pupitre MACH_PUPITRE PUPITRE 2894
151 -tegra_harmony MACH_TEGRA_HARMONY TEGRA_HARMONY 2895
152 +tegra_unused MACH_TEGRA_HARMONY TEGRA_HARMONY 2895
153 tegra_vogue MACH_TEGRA_VOGUE TEGRA_VOGUE 2896
154 tegra_e1165 MACH_TEGRA_E1165 TEGRA_E1165 2897
155 simplenet MACH_SIMPLENET SIMPLENET 2898
156 @@ -2896,6 +2896,7 @@ e10 MACH_E10 E10 2908
157 app3k_robin MACH_APP3K_ROBIN APP3K_ROBIN 2909
158 pov15hd MACH_POV15HD POV15HD 2910
159 stella MACH_STELLA STELLA 2911
160 +htc_iolite MACH_MACH_HTC_IOLITE MACH_HTC_IOLITE 2912
161 linkstation_lschl MACH_LINKSTATION_LSCHL LINKSTATION_LSCHL 2913
162 netwalker MACH_NETWALKER NETWALKER 2914
163 acsx106 MACH_ACSX106 ACSX106 2915
164 @@ -2959,6 +2960,7 @@ davinci_dm355_mmm MACH_DAVINCI_DM355_MMM
165 pc9260_v2 MACH_PC9260_V2 PC9260_V2 2973
166 ptx7545 MACH_PTX7545 PTX7545 2974
167 tm_efdc MACH_TM_EFDC TM_EFDC 2975
168 +remove_me MACH_WALDO1 WALDO1 2976
169 omap3_waldo1 MACH_OMAP3_WALDO1 OMAP3_WALDO1 2977
170 flyer MACH_FLYER FLYER 2978
171 tornado3240 MACH_TORNADO3240 TORNADO3240 2979
172 @@ -2969,7 +2971,7 @@ netspace_lite_v2 MACH_NETSPACE_LITE_V2 N
173 ssc MACH_SSC SSC 2984
174 premierwave_en MACH_PREMIERWAVE_EN PREMIERWAVE_EN 2985
175 wasabi MACH_WASABI WASABI 2986
176 -vivow MACH_VIVOW VIVOW 2987
177 +vivo_w MACH_VIVOW VIVOW 2987
178 mx50_rdp MACH_MX50_RDP MX50_RDP 2988
179 universal_c210 MACH_UNIVERSAL_C210 UNIVERSAL_C210 2989
180 real6410 MACH_REAL6410 REAL6410 2990
181 @@ -2987,7 +2989,7 @@ pxwnas_500_1000 MACH_PXWNAS_500_1000 PX
182 ea20 MACH_EA20 EA20 3002
183 awm2 MACH_AWM2 AWM2 3003
184 ti8148evm MACH_TI8148EVM TI8148EVM 3004
185 -tegra_seaboard MACH_TEGRA_SEABOARD TEGRA_SEABOARD 3005
186 +seaboard MACH_SEABOARD SEABOARD 3005
187 linkstation_chlv2 MACH_LINKSTATION_CHLV2 LINKSTATION_CHLV2 3006
188 tera_pro2_rack MACH_TERA_PRO2_RACK TERA_PRO2_RACK 3007
189 rubys MACH_RUBYS RUBYS 3008
190 @@ -3017,12 +3019,12 @@ remus MACH_REMUS REMUS 3031
191 at91cap7xdk MACH_AT91CAP7XDK AT91CAP7XDK 3032
192 at91cap7stk MACH_AT91CAP7STK AT91CAP7STK 3033
193 kt_sbc_sam9_1 MACH_KT_SBC_SAM9_1 KT_SBC_SAM9_1 3034
194 -oratisrouter MACH_ORATISROUTER ORATISROUTER 3035
195 +at91sam9263router MACH_ORATISROUTER ORATISROUTER 3035
196 armada_xp_db MACH_ARMADA_XP_DB ARMADA_XP_DB 3036
197 spdm MACH_SPDM SPDM 3037
198 gtib MACH_GTIB GTIB 3038
199 dgm3240 MACH_DGM3240 DGM3240 3039
200 -atlas_i_lpe MACH_ATLAS_I_LPE ATLAS_I_LPE 3040
201 +iv_atlas_i_lpe MACH_ATLAS_I_LPE ATLAS_I_LPE 3040
202 htcmega MACH_HTCMEGA HTCMEGA 3041
203 tricorder MACH_TRICORDER TRICORDER 3042
204 tx28 MACH_TX28 TX28 3043
205 @@ -3038,6 +3040,7 @@ s5pc110_crespo MACH_S5PC110_CRESPO S5PC
206 controltek9g20 MACH_CONTROLTEK9G20 CONTROLTEK9G20 3053
207 tin307 MACH_TIN307 TIN307 3054
208 tin510 MACH_TIN510 TIN510 3055
209 +ep3505 MACH_EP3517 EP3517 3056
210 bluecheese MACH_BLUECHEESE BLUECHEESE 3057
211 tem3x30 MACH_TEM3X30 TEM3X30 3058
212 harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059
213 @@ -3062,7 +3065,7 @@ clod MACH_CLOD CLOD 3077
214 rump MACH_RUMP RUMP 3078
215 tenderloin MACH_TENDERLOIN TENDERLOIN 3079
216 shortloin MACH_SHORTLOIN SHORTLOIN 3080
217 -crespo MACH_CRESPO CRESPO 3081
218 +roml1 MACH_CRESPO CRESPO 3081
219 antares MACH_ANTARES ANTARES 3082
220 wb40n MACH_WB40N WB40N 3083
221 herring MACH_HERRING HERRING 3084
222 @@ -3109,9 +3112,9 @@ msm8x60_fluid MACH_MSM8X60_FLUID MSM8X6
223 smartqv5 MACH_SMARTQV5 SMARTQV5 3125
224 smartqv3 MACH_SMARTQV3 SMARTQV3 3126
225 smartqv7 MACH_SMARTQV7 SMARTQV7 3127
226 -paz00 MACH_PAZ00 PAZ00 3128
227 +tegra_paz00 MACH_PAZ00 PAZ00 3128
228 acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129
229 -htcwillow MACH_HTCWILLOW HTCWILLOW 3130
230 +htc_willow MACH_HTCWILLOW HTCWILLOW 3130
231 fwbd_0404 MACH_FWBD_0404 FWBD_0404 3131
232 hdgu MACH_HDGU HDGU 3132
233 pyramid MACH_PYRAMID PYRAMID 3133
234 @@ -3162,7 +3165,7 @@ b5500 MACH_B5500 B5500 3177
235 s5500 MACH_S5500 S5500 3178
236 icon MACH_ICON ICON 3179
237 elephant MACH_ELEPHANT ELEPHANT 3180
238 -msm8x60_fusion MACH_MSM8X60_FUSION MSM8X60_FUSION 3181
239 +msm8x60_charm_surf MACH_MSM8X60_FUSION MSM8X60_FUSION 3181
240 shooter MACH_SHOOTER SHOOTER 3182
241 spade_lte MACH_SPADE_LTE SPADE_LTE 3183
242 philhwani MACH_PHILHWANI PHILHWANI 3184
243 @@ -3174,13 +3177,13 @@ ag5evm MACH_AG5EVM AG5EVM 3189
244 sc575plc MACH_SC575PLC SC575PLC 3190
245 sc575hmi MACH_SC575IPC SC575IPC 3191
246 omap3_tdm3730 MACH_OMAP3_TDM3730 OMAP3_TDM3730 3192
248 +rover_g7 MACH_G7 G7 3193
249 top9000_eval MACH_TOP9000_EVAL TOP9000_EVAL 3194
250 top9000_su MACH_TOP9000_SU TOP9000_SU 3195
251 utm300 MACH_UTM300 UTM300 3196
252 tsunagi MACH_TSUNAGI TSUNAGI 3197
253 ts75xx MACH_TS75XX TS75XX 3198
254 -msm8x60_fusn_ffa MACH_MSM8X60_FUSN_FFA MSM8X60_FUSN_FFA 3199
255 +msm8x60_charm_ffa MACH_MSM8X60_FUSN_FFA MSM8X60_FUSN_FFA 3199
256 ts47xx MACH_TS47XX TS47XX 3200
257 da850_k5 MACH_DA850_K5 DA850_K5 3201
258 ax502 MACH_AX502 AX502 3202
259 @@ -3190,9 +3193,10 @@ synergy MACH_SYNERGY SYNERGY 3205
260 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
261 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207
262 punica MACH_PUNICA PUNICA 3208
263 -sbc_nt250 MACH_SBC_NT250 SBC_NT250 3209
264 +trimslice MACH_SBC_NT250 SBC_NT250 3209
265 mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210
266 mackerel MACH_MACKEREL MACKEREL 3211
267 +pvd_imx27 MACH_MACH_PVD_IMX27 MACH_PVD_IMX27 3212
268 fa9x27 MACH_FA9X27 FA9X27 3213
269 ns2816tb MACH_NS2816TB NS2816TB 3214
270 ns2816_ntpad MACH_NS2816_NTPAD NS2816_NTPAD 3215
271 @@ -3219,3 +3223,36 @@ pivicc MACH_PIVICC PIVICC 3235
272 pcm048 MACH_PCM048 PCM048 3236
273 dds MACH_DDS DDS 3237
274 chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238
275 +ts48xx MACH_TS48XX TS48XX 3239
276 +tonga2_tfttimer MACH_TONGA2_TFTTIMER TONGA2_TFTTIMER 3240
277 +whistler MACH_WHISTLER WHISTLER 3241
278 +asl_phoenix MACH_ASL_PHOENIX ASL_PHOENIX 3242
279 +at91sam9263otlite MACH_AT91SAM9263OTLITE AT91SAM9263OTLITE 3243
280 +ddplug MACH_DDPLUG DDPLUG 3244
281 +d2plug MACH_D2PLUG D2PLUG 3245
282 +kzm9d MACH_KZM9D KZM9D 3246
283 +verdi_lte MACH_VERDI_LTE VERDI_LTE 3247
284 +nanozoom MACH_NANOZOOM NANOZOOM 3248
285 +dm3730_som_lv MACH_DM3730_SOM_LV DM3730_SOM_LV 3249
286 +dm3730_torpedo MACH_DM3730_TORPEDO DM3730_TORPEDO 3250
287 +anchovy MACH_ANCHOVY ANCHOVY 3251
288 +linux MACH_LINUX LINUX 3252
289 +re2rev20 MACH_RE2REV20 RE2REV20 3253
290 +re2rev21 MACH_RE2REV21 RE2REV21 3254
291 +cns21xx MACH_CNS21XX CNS21XX 3255
292 +rider MACH_RIDER RIDER 3257
293 +nsk330 MACH_NSK330 NSK330 3258
294 +cns2133evb MACH_CNS2133EVB CNS2133EVB 3259
295 +z3_816x_mod MACH_Z3_816X_MOD Z3_816X_MOD 3260
296 +z3_814x_mod MACH_Z3_814X_MOD Z3_814X_MOD 3261
297 +beect MACH_BEECT BEECT 3262
298 +dma_thunderbug MACH_DMA_THUNDERBUG DMA_THUNDERBUG 3263
299 +omn_at91sam9g20 MACH_OMN_AT91SAM9G20 OMN_AT91SAM9G20 3264
300 +mx25_e2s_uc MACH_MX25_E2S_UC MX25_E2S_UC 3265
301 +mione MACH_MIONE MIONE 3266
302 +top9000_rcu MACH_TOP9000_RCU TOP9000_RCU 3267
303 +top9000_bsl MACH_TOP9000_BSL TOP9000_BSL 3268
304 +kingdom MACH_KINGDOM KINGDOM 3269
305 +armadillo460 MACH_ARMADILLO460 ARMADILLO460 3270
306 +lq2 MACH_LQ2 LQ2 3271
307 +sweda_tms2 MACH_SWEDA_TMS2 SWEDA_TMS2 3272