From c9c06167e7933d93a6e396174c68abf242294abb Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 10 Jan 2001 05:27:25 +0000 Subject: Merge with Linux 2.4.0-test12. --- arch/arm/tools/mach-types | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'arch/arm/tools') diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index f3d1fb0b1..ff7ccec77 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -1,7 +1,10 @@ # Database of machine macros and numbers # -# To add an entry into this database, please see -# Documentation/arm/README +# Please do not send patches to this file; it is automatically generated! +# To add an entry into this database, please see Documentation/arm/README, +# or contact rmk@arm.linux.org.uk +# +# Last update: Mon Nov 20 22:59:11 2000 # # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number # @@ -14,7 +17,7 @@ cats ARCH_CATS CATS 6 tbox ARCH_TBOX TBOX 7 co285 ARCH_CO285 CO285 8 clps7110 ARCH_CLPS7110 CLPS7110 9 -arc ARCH_ARC ARCHIMEDES 10 +archimedes ARCH_ARC ARCHIMEDES 10 a5k ARCH_A5K A5K 11 etoile ARCH_ETOILE ETOILE 12 lacie_nas ARCH_LACIE_NAS LACIE_NAS 13 @@ -28,7 +31,7 @@ pleb SA1100_PLEB PLEB 20 integrator ARCH_INTEGRATOR INTEGRATOR 21 bitsy SA1100_BITSY BITSY 22 ixp1200 ARCH_IXP1200 IXP1200 23 -thinclient SA1100_THINCLIENT THINCLIENT 24 +p720t ARCH_P720T P720T 24 assabet SA1100_ASSABET ASSABET 25 victor SA1100_VICTOR VICTOR 26 lart SA1100_LART LART 27 @@ -42,8 +45,16 @@ extenex1 SA1100_EXTENEX1 EXTENEX1 34 sherman SA1100_SHERMAN SHERMAN 35 accelent_sa SA1100_ACCELENT ACCELENT_SA 36 accelent_l7200 ARCH_L7200_ACCELENT ACCELENT_L7200 37 +netport SA1100_NETPORT NETPORT 38 +pangolin SA1100_PANGOLIN PANGOLIN 39 +yopy SA1100_YOPY YOPY 40 +sa1100 SA1100_SA1100 SA1100 41 +huw_webpanel ARCH_HUW_WEBPANEL HUW_WEBPANEL 42 +spotme ARCH_SPOTME SPOTME 43 +freebird ARCH_FREEBIRD FREEBIRD 44 +ti925 ARCH_TI925 TI925 45 +riscstation ARCH_RISCSTATION RISCSTATION 46 +cavy SA1100_CAVY CAVY 47 # The following are unallocated empeg SA1100_EMPEG EMPEG -tifon SA1100_TIFON TIFON -penny SA1100_PENNY PENNY -- cgit v1.2.3