[src/trunk]: src/sys/arch/hpc Fix id which appeared twice, which are of HP an...

[takemura <takemura%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cd83247dae13
branches:  trunk
changeset: 504459:cd83247dae13
user:      takemura <takemura%NetBSD.org@localhost>
date:      Sat Mar 03 12:56:38 2001 +0000

description:
Fix id which appeared twice, which are of HP and CASIO. You get incompatibility
around hpcarm.

diffstat:

 sys/arch/hpc/conf/platid.def            |   70 ++++++++++++-------
 sys/arch/hpc/hpc/platid_mask.c          |  110 ++++++++++++++++++-------------
 sys/arch/hpc/hpc/platid_name.c          |   72 +++++++++++++-------
 sys/arch/hpc/include/platid_generated.h |  108 ++++++++++++++++++-------------
 sys/arch/hpc/include/platid_mask.h      |  110 ++++++++++++++++++-------------
 5 files changed, 276 insertions(+), 194 deletions(-)

diffs (truncated from 1034 to 300 lines):

diff -r 25358aafd0fa -r cd83247dae13 sys/arch/hpc/conf/platid.def
--- a/sys/arch/hpc/conf/platid.def      Sat Mar 03 12:51:44 2001 +0000
+++ b/sys/arch/hpc/conf/platid.def      Sat Mar 03 12:56:38 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platid.def,v 1.3 2001/02/21 15:04:40 uch Exp $ */
+/*     $NetBSD: platid.def,v 1.4 2001/03/03 12:56:38 takemura Exp $    */
 
 /*-
  * Copyright (c) 1999-2001
@@ -113,7 +113,9 @@
     }
   }
 }
+#endif /* hpcmips */
 
+#ifdef hpcmips
 Everex {
   Freestyle {
     CPU=MIPS_VR_41XX
@@ -123,7 +125,9 @@
     }
   }
 }
+#endif /* hpcmips */
 
+#ifdef hpcmips
 CASIO {
   CassiopeiaE " Cassiopeia" {
     EXX {
@@ -137,7 +141,9 @@
     }
   }
 }
+#endif /* hpcmips */
 
+#ifdef hpcmips
 Sharp {
   Tripad {
     PV {
@@ -158,7 +164,9 @@
     }
   }
 }
+#endif /* hpcmips */
 
+#ifdef hpcmips
 Fujitsu {
   INTERTOP {
     ITXXX {
@@ -166,7 +174,9 @@
     }
   }
 }
+#endif /* hpcmips */
 
+#ifdef hpcmips
 Philips {
   Nino {
     3XX {
@@ -174,8 +184,10 @@
     }
   }
 }
+#endif /* hpcmips */
 
 Compaq {
+#ifdef hpcmips
   C {
     8XX {
       CPU=MIPS_TX_3912 810
@@ -197,8 +209,16 @@
       CPU=MIPS_VR_4111 213
     }
   }
+#endif /* hpcmips */
+#ifdef hpcarm
+  IPAQ " iPAQ" {
+    CPU=ARM_STRONGARM_SA1110
+    H3600
+  }
+#endif /* hpcarm */
 }
 
+#ifdef hpcmips
 Victor {
   InterLink {
     MP {
@@ -206,7 +226,9 @@
     }
   }
 }
+#endif /* hpcmips */
 
+#ifdef hpcmips
 IBM {
   WorkPad {
     z50 {
@@ -214,7 +236,9 @@
     }
   }
 }
+#endif /* hpcmips */
 
+#ifdef hpcmips
 VADEM {
   CLIO {
     C {
@@ -225,14 +249,16 @@
 }
 #endif /* hpcmips */
 
+HP {
 #ifdef hpcsh
-HP {
        LX {
                CPU=SH_3_7709
                        620 --"HP620LX"
                        620JP --"HP620LX (Japanese)"
        }
+#endif /* hpcsh */
        JORNADA " Jornada" {
+#ifdef hpcsh
                6XX {
                        CPU=SH_3_7709A 
                        680
@@ -240,16 +266,32 @@
                        690
                        690JP -" 690 (Japanese)"
                }
+#endif /* hpcsh */
+#ifdef hpcarm
+               7XX {
+                       CPU=ARM_STRONGARM_SA1110
+                       720
+                       720JP -" 720 (Japanese)"
+               }
+               8XX {
+                       CPU=ARM_STRONGARM_SA1100
+                       820
+                       820JP -" 820 (Japanese)"
+               }
+#endif /* hpcarm */
        }
 }
 
+#ifdef hpcsh
 HITACHI {
        PERSONA {
                CPU=SH_3_7709
                        HPW230JC
        }
 }
+#endif /* hpcsh */
 
+#ifdef hpcsh
 LGE {
        Phenom "Phenom" {
                CPU=SH_3_7709
@@ -257,27 +299,3 @@
        }
 }
 #endif /* hpcsh */
-
-#ifdef hpcarm
-HP {
-       JORNADA " Jornada" {
-               8XX {
-                       CPU=ARM_STRONGARM_SA1100
-                       820
-                       820JP -" 820 (Japanese)"
-               }
-               7XX {
-                       CPU=ARM_STRONGARM_SA1110
-                       720
-                       720JP -" 720 (Japanese)"
-               }
-       }
-}
-
-Compaq {
-       IPAQ " iPAQ" {
-               CPU=ARM_STRONGARM_SA1110
-               H3600
-       }
-}
-#endif /* hpcarm */
diff -r 25358aafd0fa -r cd83247dae13 sys/arch/hpc/hpc/platid_mask.c
--- a/sys/arch/hpc/hpc/platid_mask.c    Sat Mar 03 12:51:44 2001 +0000
+++ b/sys/arch/hpc/hpc/platid_mask.c    Sat Mar 03 12:56:38 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platid_mask.c,v 1.3 2001/02/21 15:04:40 uch Exp $      */
+/*     $NetBSD: platid_mask.c,v 1.4 2001/03/03 12:56:38 takemura Exp $ */
 
 /*-
  * Copyright (c) 1999-2001
@@ -245,6 +245,8 @@
        PLATID_CPU_MIPS_VR_4121,
        PLATID_MACH_NEC_MCR_730A
 }};
+#endif /* hpcmips */
+#ifdef hpcmips
 platid_t platid_mask_MACH_EVEREX = {{
        PLATID_WILD,
        PLATID_MACH_EVEREX
@@ -269,6 +271,8 @@
        PLATID_CPU_MIPS_VR_4111,
        PLATID_MACH_EVEREX_FREESTYLE_A20
 }};
+#endif /* hpcmips */
+#ifdef hpcmips
 platid_t platid_mask_MACH_CASIO = {{
        PLATID_WILD,
        PLATID_MACH_CASIO
@@ -325,6 +329,8 @@
        PLATID_CPU_MIPS_VR_4121,
        PLATID_MACH_CASIO_CASSIOPEIAE_E507
 }};
+#endif /* hpcmips */
+#ifdef hpcmips
 platid_t platid_mask_MACH_SHARP = {{
        PLATID_WILD,
        PLATID_MACH_SHARP
@@ -377,6 +383,8 @@
        PLATID_CPU_MIPS_TX_3912,
        PLATID_MACH_SHARP_MOBILON_HC1200
 }};
+#endif /* hpcmips */
+#ifdef hpcmips
 platid_t platid_mask_MACH_FUJITSU = {{
        PLATID_WILD,
        PLATID_MACH_FUJITSU
@@ -397,6 +405,8 @@
        PLATID_CPU_MIPS_VR_4121,
        PLATID_MACH_FUJITSU_INTERTOP_IT310
 }};
+#endif /* hpcmips */
+#ifdef hpcmips
 platid_t platid_mask_MACH_PHILIPS = {{
        PLATID_WILD,
        PLATID_MACH_PHILIPS
@@ -413,10 +423,12 @@
        PLATID_CPU_MIPS_TX_3912,
        PLATID_MACH_PHILIPS_NINO_312
 }};
+#endif /* hpcmips */
 platid_t platid_mask_MACH_COMPAQ = {{
        PLATID_WILD,
        PLATID_MACH_COMPAQ
 }};
+#ifdef hpcmips
 platid_t platid_mask_MACH_COMPAQ_C = {{
        PLATID_WILD,
        PLATID_MACH_COMPAQ_C
@@ -481,6 +493,18 @@
        PLATID_CPU_MIPS_VR_4111,
        PLATID_MACH_COMPAQ_PRESARIO_213
 }};
+#endif /* hpcmips */
+#ifdef hpcarm
+platid_t platid_mask_MACH_COMPAQ_IPAQ = {{
+       PLATID_WILD,
+       PLATID_MACH_COMPAQ_IPAQ
+}};
+platid_t platid_mask_MACH_COMPAQ_IPAQ_H3600 = {{
+       PLATID_CPU_ARM_STRONGARM_SA1110,
+       PLATID_MACH_COMPAQ_IPAQ_H3600
+}};
+#endif /* hpcarm */
+#ifdef hpcmips
 platid_t platid_mask_MACH_VICTOR = {{
        PLATID_WILD,
        PLATID_MACH_VICTOR
@@ -497,6 +521,8 @@
        PLATID_CPU_MIPS_TX_3922,
        PLATID_MACH_VICTOR_INTERLINK_MPC101
 }};
+#endif /* hpcmips */
+#ifdef hpcmips
 platid_t platid_mask_MACH_IBM = {{
        PLATID_WILD,
        PLATID_MACH_IBM
@@ -513,6 +539,8 @@
        PLATID_CPU_MIPS_VR_4121,
        PLATID_MACH_IBM_WORKPAD_26011AU
 }};
+#endif /* hpcmips */
+#ifdef hpcmips
 platid_t platid_mask_MACH_VADEM = {{
        PLATID_WILD,
        PLATID_MACH_VADEM
@@ -534,11 +562,11 @@
        PLATID_MACH_VADEM_CLIO_C1050
 }};
 #endif /* hpcmips */
-#ifdef hpcsh
 platid_t platid_mask_MACH_HP = {{
        PLATID_WILD,
        PLATID_MACH_HP
 }};
+#ifdef hpcsh