From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 22 Sep 2012 09:48:20 +0200 Subject: merge opensource jb u5 Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2 --- arch/arm/tools/mach-types | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'arch/arm/tools') diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 70adf8208b4..c5c60ff9ce7 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -590,7 +590,7 @@ bury_bl7582 MACH_BURY_BL7582 BURY_BL7582 2946 bury_bps5270 MACH_BURY_BPS5270 BURY_BPS5270 2947 basi MACH_BASI BASI 2948 tn200 MACH_TN200 TN200 2949 -c2mmi MACH_C2MMI C2MMI 2950 +c2mmi MACH_M3MMI C2MMI 2950 meson_6236m MACH_MESON_6236M MESON_6236M 2951 meson_8626m MACH_MESON_8626M MESON_8626M 2952 tube MACH_TUBE TUBE 2953 @@ -1004,6 +1004,7 @@ xilinx_ep107 MACH_XILINX_EP107 XILINX_EP107 3378 nuri MACH_NURI NURI 3379 janus MACH_JANUS JANUS 3380 ddnas MACH_DDNAS DDNAS 3381 +u1hd MACH_U1HD U1HD 3381 tag MACH_TAG TAG 3382 tagw MACH_TAGW TAGW 3383 nitrogen_vm_imx51 MACH_NITROGEN_VM_IMX51 NITROGEN_VM_IMX51 3384 @@ -1114,8 +1115,11 @@ thales_adc MACH_THALES_ADC THALES_ADC 3492 ubisys_p9d_evp MACH_UBISYS_P9D_EVP UBISYS_P9D_EVP 3493 atdgp318 MACH_ATDGP318 ATDGP318 3494 smdk4212 MACH_SMDK4212 SMDK4212 3698 -smdk4x12 MACH_SMDK4412 SMDK4412 3765 +smdk4412 MACH_SMDK4412 SMDK4412 3765 slp_pq MACH_SLP_PQ SLP_PQ 3766 slp_pq_lte MACH_SLP_PQ_LTE SLP_PQ_LTE 3767 smdk5210 MACH_SMDK5210 SMDK5210 3774 smdk5250 MACH_SMDK5250 SMDK5250 3825 +trats MACH_TRATS TRATS 3928 +redwood MACH_REDWOOD REDWOOD 3768 +t0_lte MACH_SLP_T0_LTE SLP_T0_LTE 3769 \ No newline at end of file -- cgit v1.2.3