mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
Merge branch 'mach-types'
This commit is contained in:
Russell King
commit
3fcca9ac6c
@ -12,7 +12,7 @@
|
||||
#
|
||||
# http://www.arm.linux.org.uk/developer/machines/?action=new
|
||||
#
|
||||
# Last update: Fri Sep 18 21:42:00 2009
|
||||
# Last update: Wed Nov 25 22:14:58 2009
|
||||
#
|
||||
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
||||
#
|
||||
@ -928,7 +928,7 @@ palmt5 MACH_PALMT5 PALMT5 917
|
||||
palmtc MACH_PALMTC PALMTC 918
|
||||
omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919
|
||||
mxc30030evb MACH_MXC30030EVB MXC30030EVB 920
|
||||
rea_2d MACH_REA_2D REA_2D 921
|
||||
rea_cpu2 MACH_REA_2D REA_2D 921
|
||||
eti3e524 MACH_TI3E524 TI3E524 922
|
||||
ateb9200 MACH_ATEB9200 ATEB9200 923
|
||||
auckland MACH_AUCKLAND AUCKLAND 924
|
||||
@ -2421,3 +2421,118 @@ liberty MACH_LIBERTY LIBERTY 2434
|
||||
mh355 MACH_MH355 MH355 2435
|
||||
pc7802 MACH_PC7802 PC7802 2436
|
||||
gnet_sgc MACH_GNET_SGC GNET_SGC 2437
|
||||
einstein15 MACH_EINSTEIN15 EINSTEIN15 2438
|
||||
cmpd MACH_CMPD CMPD 2439
|
||||
davinci_hase1 MACH_DAVINCI_HASE1 DAVINCI_HASE1 2440
|
||||
lgeincitephone MACH_LGEINCITEPHONE LGEINCITEPHONE 2441
|
||||
ea313x MACH_EA313X EA313X 2442
|
||||
fwbd_39064 MACH_FWBD_39064 FWBD_39064 2443
|
||||
fwbd_390128 MACH_FWBD_390128 FWBD_390128 2444
|
||||
pelco_moe MACH_PELCO_MOE PELCO_MOE 2445
|
||||
minimix27 MACH_MINIMIX27 MINIMIX27 2446
|
||||
omap3_thunder MACH_OMAP3_THUNDER OMAP3_THUNDER 2447
|
||||
passionc MACH_PASSIONC PASSIONC 2448
|
||||
mx27amata MACH_MX27AMATA MX27AMATA 2449
|
||||
bgat1 MACH_BGAT1 BGAT1 2450
|
||||
buzz MACH_BUZZ BUZZ 2451
|
||||
mb9g20 MACH_MB9G20 MB9G20 2452
|
||||
yushan MACH_YUSHAN YUSHAN 2453
|
||||
lizard MACH_LIZARD LIZARD 2454
|
||||
omap3polycom MACH_OMAP3POLYCOM OMAP3POLYCOM 2455
|
||||
smdkv210 MACH_SMDKV210 SMDKV210 2456
|
||||
bravo MACH_BRAVO BRAVO 2457
|
||||
siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 2458
|
||||
siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459
|
||||
sm3k MACH_SM3K SM3K 2460
|
||||
acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461
|
||||
sst61vc010_dev MACH_SST61VC010_DEV SST61VC010_DEV 2462
|
||||
glittertind MACH_GLITTERTIND GLITTERTIND 2463
|
||||
omap_zoom3 MACH_OMAP_ZOOM3 OMAP_ZOOM3 2464
|
||||
omap_3630sdp MACH_OMAP_3630SDP OMAP_3630SDP 2465
|
||||
cybook2440 MACH_CYBOOK2440 CYBOOK2440 2466
|
||||
torino_s MACH_TORINO_S TORINO_S 2467
|
||||
havana MACH_HAVANA HAVANA 2468
|
||||
beaumont_11 MACH_BEAUMONT_11 BEAUMONT_11 2469
|
||||
vanguard MACH_VANGUARD VANGUARD 2470
|
||||
s5pc110_draco MACH_S5PC110_DRACO S5PC110_DRACO 2471
|
||||
cartesio_two MACH_CARTESIO_TWO CARTESIO_TWO 2472
|
||||
aster MACH_ASTER ASTER 2473
|
||||
voguesv210 MACH_VOGUESV210 VOGUESV210 2474
|
||||
acm500x MACH_ACM500X ACM500X 2475
|
||||
km9260 MACH_KM9260 KM9260 2476
|
||||
nideflexg1 MACH_NIDEFLEXG1 NIDEFLEXG1 2477
|
||||
ctera_plug_io MACH_CTERA_PLUG_IO CTERA_PLUG_IO 2478
|
||||
smartq7 MACH_SMARTQ7 SMARTQ7 2479
|
||||
at91sam9g10ek2 MACH_AT91SAM9G10EK2 AT91SAM9G10EK2 2480
|
||||
asusp527 MACH_ASUSP527 ASUSP527 2481
|
||||
at91sam9g20mpm2 MACH_AT91SAM9G20MPM2 AT91SAM9G20MPM2 2482
|
||||
topasa900 MACH_TOPASA900 TOPASA900 2483
|
||||
electrum_100 MACH_ELECTRUM_100 ELECTRUM_100 2484
|
||||
mx51grb MACH_MX51GRB MX51GRB 2485
|
||||
xea300 MACH_XEA300 XEA300 2486
|
||||
htcstartrek MACH_HTCSTARTREK HTCSTARTREK 2487
|
||||
lima MACH_LIMA LIMA 2488
|
||||
csb740 MACH_CSB740 CSB740 2489
|
||||
usb_s8815 MACH_USB_S8815 USB_S8815 2490
|
||||
watson_efm_plugin MACH_WATSON_EFM_PLUGIN WATSON_EFM_PLUGIN 2491
|
||||
milkyway MACH_MILKYWAY MILKYWAY 2492
|
||||
g4evm MACH_G4EVM G4EVM 2493
|
||||
picomod6 MACH_PICOMOD6 PICOMOD6 2494
|
||||
omapl138_hawkboard MACH_OMAPL138_HAWKBOARD OMAPL138_HAWKBOARD 2495
|
||||
ip6000 MACH_IP6000 IP6000 2496
|
||||
ip6010 MACH_IP6010 IP6010 2497
|
||||
utm400 MACH_UTM400 UTM400 2498
|
||||
omap3_zybex MACH_OMAP3_ZYBEX OMAP3_ZYBEX 2499
|
||||
wireless_space MACH_WIRELESS_SPACE WIRELESS_SPACE 2500
|
||||
sx560 MACH_SX560 SX560 2501
|
||||
ts41x MACH_TS41X TS41X 2502
|
||||
elphel10373 MACH_ELPHEL10373 ELPHEL10373 2503
|
||||
rhobot MACH_RHOBOT RHOBOT 2504
|
||||
mx51_refresh MACH_MX51_REFRESH MX51_REFRESH 2505
|
||||
ls9260 MACH_LS9260 LS9260 2506
|
||||
shank MACH_SHANK SHANK 2507
|
||||
qsd8x50_st1 MACH_QSD8X50_ST1 QSD8X50_ST1 2508
|
||||
at91sam9m10ekes MACH_AT91SAM9M10EKES AT91SAM9M10EKES 2509
|
||||
hiram MACH_HIRAM HIRAM 2510
|
||||
phy3250 MACH_PHY3250 PHY3250 2511
|
||||
ea3250 MACH_EA3250 EA3250 2512
|
||||
fdi3250 MACH_FDI3250 FDI3250 2513
|
||||
whitestone MACH_WHITESTONE WHITESTONE 2514
|
||||
at91sam9263nit MACH_AT91SAM9263NIT AT91SAM9263NIT 2515
|
||||
ccmx51 MACH_CCMX51 CCMX51 2516
|
||||
ccmx51js MACH_CCMX51JS CCMX51JS 2517
|
||||
ccwmx51 MACH_CCWMX51 CCWMX51 2518
|
||||
ccwmx51js MACH_CCWMX51JS CCWMX51JS 2519
|
||||
mini6410 MACH_MINI6410 MINI6410 2520
|
||||
tiny6410 MACH_TINY6410 TINY6410 2521
|
||||
nano6410 MACH_NANO6410 NANO6410 2522
|
||||
at572d940hfnldb MACH_AT572D940HFNLDB AT572D940HFNLDB 2523
|
||||
htcleo MACH_HTCLEO HTCLEO 2524
|
||||
avp13 MACH_AVP13 AVP13 2525
|
||||
xxsvideod MACH_XXSVIDEOD XXSVIDEOD 2526
|
||||
vpnext MACH_VPNEXT VPNEXT 2527
|
||||
swarco_itc3 MACH_SWARCO_ITC3 SWARCO_ITC3 2528
|
||||
tx51 MACH_TX51 TX51 2529
|
||||
dolby_cat1021 MACH_DOLBY_CAT1021 DOLBY_CAT1021 2530
|
||||
mx28evk MACH_MX28EVK MX28EVK 2531
|
||||
phoenix260 MACH_PHOENIX260 PHOENIX260 2532
|
||||
uvaca_stork MACH_UVACA_STORK UVACA_STORK 2533
|
||||
smartq5 MACH_SMARTQ5 SMARTQ5 2534
|
||||
all3078 MACH_ALL3078 ALL3078 2535
|
||||
ctera_2bay_ds MACH_CTERA_2BAY_DS CTERA_2BAY_DS 2536
|
||||
siogentoo3 MACH_SIOGENTOO3 SIOGENTOO3 2537
|
||||
epb5000 MACH_EPB5000 EPB5000 2538
|
||||
hy9263 MACH_HY9263 HY9263 2539
|
||||
acer_tempo_m900 MACH_ACER_TEMPO_M900 ACER_TEMPO_M900 2540
|
||||
acer_tempo_dx650 MACH_ACER_TEMPO_DX900 ACER_TEMPO_DX900 2541
|
||||
acer_tempo_x960 MACH_ACER_TEMPO_X960 ACER_TEMPO_X960 2542
|
||||
acer_eten_v900 MACH_ACER_ETEN_V900 ACER_ETEN_V900 2543
|
||||
acer_eten_x900 MACH_ACER_ETEN_X900 ACER_ETEN_X900 2544
|
||||
bonnell MACH_BONNELL BONNELL 2545
|
||||
oht_mx27 MACH_OHT_MX27 OHT_MX27 2546
|
||||
htcquartz MACH_HTCQUARTZ HTCQUARTZ 2547
|
||||
davinci_dm6467tevm MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM 2548
|
||||
c3ax03 MACH_C3AX03 C3AX03 2549
|
||||
mxt_td60 MACH_MXT_TD60 MXT_TD60 2550
|
||||
esyx MACH_ESYX ESYX 2551
|
||||
bulldog MACH_BULLDOG BULLDOG 2553
|
||||
|
||||
Loading…
Reference in New Issue
Block a user