Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/hpc - add VR4181 and VR4122 cpu for hpcmips. and re...



details:   https://anonhg.NetBSD.org/src/rev/67b82e56cfa6
branches:  trunk
changeset: 508809:67b82e56cfa6
user:      sato <sato%NetBSD.org@localhost>
date:      Fri Apr 20 10:15:02 2001 +0000

description:
- add VR4181 and VR4122 cpu for hpcmips. and regen headers.
- add new option 'options BOOT_STANDALONE'
        boot from standalone(not WinCE application) boot loader.
- add new option 'options SPEC_PLATFORM'
        statically specify platid in config file.
        In BOOT_STANDALONE case,
        'options SPEC_PLATFORM=platid_mask_MACH_xxx_yyy',
        and add 'options SPEC_MACH_xxx'&'options SPEC_MACH_xxx_yyy'.
        for  specify platid in config file statically'
        In wince boot case, 'options SPEC_PLATFORM'
        and add 'options SPEC_MACH_xxx'&'options SPEC_MACH_xxx_yyy' for
        config level size optimization.
XXX: now I working in hpcmips...

diffstat:

 sys/arch/hpc/conf/files.hpc              |   14 +-
 sys/arch/hpc/conf/platid.def             |    4 +-
 sys/arch/hpc/hpc/platid_gen/platid_gen.c |   17 +-
 sys/arch/hpc/hpc/platid_mask.c           |   10 +-
 sys/arch/hpc/hpc/platid_name.c           |    6 +-
 sys/arch/hpc/include/platid_generated.h  |  415 ++++++++++++++++++++++++++++++-
 sys/arch/hpc/include/platid_mask.h       |   10 +-
 7 files changed, 469 insertions(+), 7 deletions(-)

diffs (truncated from 1137 to 300 lines):

diff -r e35de5bd63e4 -r 67b82e56cfa6 sys/arch/hpc/conf/files.hpc
--- a/sys/arch/hpc/conf/files.hpc       Fri Apr 20 10:08:01 2001 +0000
+++ b/sys/arch/hpc/conf/files.hpc       Fri Apr 20 10:15:02 2001 +0000
@@ -1,5 +1,17 @@
-#      $NetBSD: files.hpc,v 1.2 2001/02/05 17:41:22 uch Exp $
+#      $NetBSD: files.hpc,v 1.3 2001/04/20 10:15:02 sato Exp $
 
+#
+# STANDALONE BOOT or BOOT from WinCE
+# 
+defopt  BOOT_STANDALONE
+#
+# Specified platform only?
+# 
+defopt  SPEC_PLATFORM
+  
+#
+# hpc support functions
+#
 file   arch/hpc/hpc/config_hook.c
 file   arch/hpc/hpc/platid.c
 file   arch/hpc/hpc/platid_mask.c
diff -r e35de5bd63e4 -r 67b82e56cfa6 sys/arch/hpc/conf/platid.def
--- a/sys/arch/hpc/conf/platid.def      Fri Apr 20 10:08:01 2001 +0000
+++ b/sys/arch/hpc/conf/platid.def      Fri Apr 20 10:15:02 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platid.def,v 1.6 2001/03/22 18:16:13 uch Exp $ */
+/*     $NetBSD: platid.def,v 1.7 2001/04/20 10:15:02 sato Exp $        */
 
 /*-
  * Copyright (c) 1999-2001
@@ -45,6 +45,8 @@
       4102
       4111
       4121
+      4181
+      4122
     }
   }
   TX {
diff -r e35de5bd63e4 -r 67b82e56cfa6 sys/arch/hpc/hpc/platid_gen/platid_gen.c
--- a/sys/arch/hpc/hpc/platid_gen/platid_gen.c  Fri Apr 20 10:08:01 2001 +0000
+++ b/sys/arch/hpc/hpc/platid_gen/platid_gen.c  Fri Apr 20 10:15:02 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platid_gen.c,v 1.2 2001/02/04 05:19:15 takemura Exp $  */
+/*     $NetBSD: platid_gen.c,v 1.3 2001/04/20 10:15:03 sato Exp $      */
 
 /*-
  * Copyright (c) 1999
@@ -380,6 +380,16 @@
  * #define PLATID_CPU_XXX_YYY  \
  *   ((PLATID_CPU_XXX_YYY_NUM << PLATID_CPU_SERIES_SHIFT)| \
  *     PLATID_CPU_XXX)
+ *
+ * #ifndef SPEC_PLATFORM
+ * #define SPEC_MACH_XXX
+ * #endif 
+ * #define PLATID_MACH_XXX_NUM 1
+ * #define PLATID_MACH_XXX     \
+ *   ((PLATID_MACH_XXX_NUM << PLATID_MACH_ARCH_SHIFT))
+ * #define PLATID_MACH_XXX_YYY \
+ *   ((PLATID_MACH_XXX_YYY_NUM << PLATID_MACH_SERIES_SHIFT)| \
+ *     PLATID_MACH_XXX)
  */
 void
 gen_header()
@@ -387,6 +397,11 @@
        char *prefix = prefix_names[mode];
        char *name = genctx[mode][nest].sym;
 
+       if (mode == MODE_MACHINE) {
+       fprintf(fp_out, "#ifndef SPEC_PLATFORM\n");
+       fprintf(fp_out, "#define %s_%s_%s\n", "SPEC", prefix, name);
+       fprintf(fp_out, "#endif /* !SPEC_PLATFORM */\n");
+       }
        fprintf(fp_out, "#define %s_%s_%s_NUM\t%d\n", PREFIX, prefix, name,
                genctx[mode][nest].num);
        fprintf(fp_out, "#define %s_%s_%s\t\\\n", PREFIX, prefix, name);
diff -r e35de5bd63e4 -r 67b82e56cfa6 sys/arch/hpc/hpc/platid_mask.c
--- a/sys/arch/hpc/hpc/platid_mask.c    Fri Apr 20 10:08:01 2001 +0000
+++ b/sys/arch/hpc/hpc/platid_mask.c    Fri Apr 20 10:15:02 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platid_mask.c,v 1.6 2001/03/22 18:16:14 uch Exp $      */
+/*     $NetBSD: platid_mask.c,v 1.7 2001/04/20 10:15:03 sato Exp $     */
 
 /*-
  * Copyright (c) 1999-2001
@@ -63,6 +63,14 @@
        PLATID_CPU_MIPS_VR_4121,
        PLATID_WILD
 }};
+platid_t platid_mask_CPU_MIPS_VR_4181 = {{
+       PLATID_CPU_MIPS_VR_4181,
+       PLATID_WILD
+}};
+platid_t platid_mask_CPU_MIPS_VR_4122 = {{
+       PLATID_CPU_MIPS_VR_4122,
+       PLATID_WILD
+}};
 platid_t platid_mask_CPU_MIPS_TX = {{
        PLATID_CPU_MIPS_TX,
        PLATID_WILD
diff -r e35de5bd63e4 -r 67b82e56cfa6 sys/arch/hpc/hpc/platid_name.c
--- a/sys/arch/hpc/hpc/platid_name.c    Fri Apr 20 10:08:01 2001 +0000
+++ b/sys/arch/hpc/hpc/platid_name.c    Fri Apr 20 10:15:02 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platid_name.c,v 1.6 2001/03/22 18:16:15 uch Exp $      */
+/*     $NetBSD: platid_name.c,v 1.7 2001/04/20 10:15:03 sato Exp $     */
 
 /*-
  * Copyright (c) 1999-2001
@@ -52,6 +52,10 @@
         TEXT("MIPS VR 4111") },
        { &platid_mask_CPU_MIPS_VR_4121,
         TEXT("MIPS VR 4121") },
+       { &platid_mask_CPU_MIPS_VR_4181,
+        TEXT("MIPS VR 4181") },
+       { &platid_mask_CPU_MIPS_VR_4122,
+        TEXT("MIPS VR 4122") },
        { &platid_mask_CPU_MIPS_TX,
         TEXT("MIPS TX") },
        { &platid_mask_CPU_MIPS_TX_3900,
diff -r e35de5bd63e4 -r 67b82e56cfa6 sys/arch/hpc/include/platid_generated.h
--- a/sys/arch/hpc/include/platid_generated.h   Fri Apr 20 10:08:01 2001 +0000
+++ b/sys/arch/hpc/include/platid_generated.h   Fri Apr 20 10:15:02 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platid_generated.h,v 1.6 2001/03/22 18:16:15 uch Exp $ */
+/*     $NetBSD: platid_generated.h,v 1.7 2001/04/20 10:15:03 sato Exp $        */
 
 /*-
  * Copyright (c) 1999-2001
@@ -60,6 +60,14 @@
 #define PLATID_CPU_MIPS_VR_4121        \
   ((PLATID_CPU_MIPS_VR_4121_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
     PLATID_CPU_MIPS_VR_41XX)
+#define PLATID_CPU_MIPS_VR_4181_NUM    4
+#define PLATID_CPU_MIPS_VR_4181        \
+  ((PLATID_CPU_MIPS_VR_4181_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
+    PLATID_CPU_MIPS_VR_41XX)
+#define PLATID_CPU_MIPS_VR_4122_NUM    5
+#define PLATID_CPU_MIPS_VR_4122        \
+  ((PLATID_CPU_MIPS_VR_4122_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \
+    PLATID_CPU_MIPS_VR_41XX)
 #define PLATID_CPU_MIPS_TX_NUM 2
 #define PLATID_CPU_MIPS_TX     \
   ((PLATID_CPU_MIPS_TX_NUM << PLATID_CPU_SERIES_SHIFT)| \
@@ -128,561 +136,966 @@
     PLATID_CPU_ARM_STRONGARM)
 #endif /* hpcarm */
 #ifdef hpcmips
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_NUM    1
 #define PLATID_MACH_NEC        \
   ((PLATID_MACH_NEC_NUM << PLATID_VENDOR_SHIFT))
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCCS
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCCS_NUM       1
 #define PLATID_MACH_NEC_MCCS   \
   ((PLATID_MACH_NEC_MCCS_NUM << PLATID_SERIES_SHIFT)| \
     PLATID_MACH_NEC)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCCS_1X
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCCS_1X_NUM    1
 #define PLATID_MACH_NEC_MCCS_1X        \
   ((PLATID_MACH_NEC_MCCS_1X_NUM << PLATID_MODEL_SHIFT)| \
     PLATID_MACH_NEC_MCCS)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCCS_11
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCCS_11_NUM    1
 #define PLATID_MACH_NEC_MCCS_11        \
   ((PLATID_MACH_NEC_MCCS_11_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCCS_1X)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCCS_12
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCCS_12_NUM    2
 #define PLATID_MACH_NEC_MCCS_12        \
   ((PLATID_MACH_NEC_MCCS_12_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCCS_1X)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCCS_13
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCCS_13_NUM    3
 #define PLATID_MACH_NEC_MCCS_13        \
   ((PLATID_MACH_NEC_MCCS_13_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCCS_1X)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_NUM        2
 #define PLATID_MACH_NEC_MCR    \
   ((PLATID_MACH_NEC_MCR_NUM << PLATID_SERIES_SHIFT)| \
     PLATID_MACH_NEC)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_3XX
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_3XX_NUM    1
 #define PLATID_MACH_NEC_MCR_3XX        \
   ((PLATID_MACH_NEC_MCR_3XX_NUM << PLATID_MODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_300
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_300_NUM    1
 #define PLATID_MACH_NEC_MCR_300        \
   ((PLATID_MACH_NEC_MCR_300_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_3XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_320
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_320_NUM    2
 #define PLATID_MACH_NEC_MCR_320        \
   ((PLATID_MACH_NEC_MCR_320_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_3XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_FORDOCOMO
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_FORDOCOMO_NUM      3
 #define PLATID_MACH_NEC_MCR_FORDOCOMO  \
   ((PLATID_MACH_NEC_MCR_FORDOCOMO_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_3XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_MPRO700
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_MPRO700_NUM        4
 #define PLATID_MACH_NEC_MCR_MPRO700    \
   ((PLATID_MACH_NEC_MCR_MPRO700_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_3XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_330
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_330_NUM    5
 #define PLATID_MACH_NEC_MCR_330        \
   ((PLATID_MACH_NEC_MCR_330_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_3XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_5XX
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_5XX_NUM    2
 #define PLATID_MACH_NEC_MCR_5XX        \
   ((PLATID_MACH_NEC_MCR_5XX_NUM << PLATID_MODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_500
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_500_NUM    1
 #define PLATID_MACH_NEC_MCR_500        \
   ((PLATID_MACH_NEC_MCR_500_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_5XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_510
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_510_NUM    2
 #define PLATID_MACH_NEC_MCR_510        \
   ((PLATID_MACH_NEC_MCR_510_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_5XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_520
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_520_NUM    3
 #define PLATID_MACH_NEC_MCR_520        \
   ((PLATID_MACH_NEC_MCR_520_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_5XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_520A
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_520A_NUM   4
 #define PLATID_MACH_NEC_MCR_520A       \
   ((PLATID_MACH_NEC_MCR_520A_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_5XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_500A
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_500A_NUM   5
 #define PLATID_MACH_NEC_MCR_500A       \
   ((PLATID_MACH_NEC_MCR_500A_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_5XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_530
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_530_NUM    6
 #define PLATID_MACH_NEC_MCR_530        \
   ((PLATID_MACH_NEC_MCR_530_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_5XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_430
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_430_NUM    7
 #define PLATID_MACH_NEC_MCR_430        \
   ((PLATID_MACH_NEC_MCR_430_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_NEC_MCR_5XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_NEC_MCR_530A
+#endif /* !SPEC_PLATFORM */
 #define PLATID_MACH_NEC_MCR_530A_NUM   8



Home | Main Index | Thread Index | Old Index