[src/netbsd-6]: src/sys/arch/hp700 Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/e8ddae24eb58
branches:  netbsd-6
changeset: 773838:e8ddae24eb58
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Feb 27 20:15:33 2012 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #54):
        sys/arch/hp700/dev/cpudevs_data.h: revision 1.8
        sys/arch/hp700/dev/cpudevs: revision 1.6
        sys/arch/hp700/hp700/machdep.c: revision 1.109
        sys/arch/hp700/dev/cpudevs.h: revision 1.7
Take an educiated guess at the CPU id for PCXW+ (Landshark)
Regen
Use new HPPA_CPU_PCXWP for PA8600 (Landshark)

diffstat:

 sys/arch/hp700/dev/cpudevs        |  4 ++--
 sys/arch/hp700/dev/cpudevs.h      |  5 +++--
 sys/arch/hp700/dev/cpudevs_data.h |  5 +++--
 sys/arch/hp700/hp700/machdep.c    |  6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diffs (91 lines):

diff -r 2c0754074e06 -r e8ddae24eb58 sys/arch/hp700/dev/cpudevs
--- a/sys/arch/hp700/dev/cpudevs        Mon Feb 27 20:13:30 2012 +0000
+++ b/sys/arch/hp700/dev/cpudevs        Mon Feb 27 20:15:33 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: cpudevs,v 1.5 2009/04/30 07:01:26 skrll Exp $
+$NetBSD: cpudevs,v 1.5.18.1 2012/02/27 20:15:33 riz Exp $
 
 $OpenBSD: cpudevs,v 1.44 2007/05/18 15:57:35 kettenis Exp $
 
@@ -322,7 +322,7 @@
 cpu    PCXL2   0x0f    PCXL2 (Velociraptor)
 cpu    PCXUP   0x10    PCXU+ (Vulcan)
 cpu    PCXW    0x11    PCXW (Vulcan)
-#cpu   PCXWP   0x??    PCXW+ (Landshark)
+cpu    PCXWP   0x12    PCXW+ (Landshark)
 cpu    PCXW2   0x13    PCXW2 (Piranha)
 #cpu   PCXM    0x??    Mako
 #cpu   PCXM2   0x??    Shortfin
diff -r 2c0754074e06 -r e8ddae24eb58 sys/arch/hp700/dev/cpudevs.h
--- a/sys/arch/hp700/dev/cpudevs.h      Mon Feb 27 20:13:30 2012 +0000
+++ b/sys/arch/hp700/dev/cpudevs.h      Mon Feb 27 20:15:33 2012 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: cpudevs.h,v 1.6 2012/02/04 17:05:38 skrll Exp $        */
+/*     $NetBSD: cpudevs.h,v 1.6.2.1 2012/02/27 20:15:33 riz Exp $      */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
  * generated from:
- *     NetBSD: cpudevs,v 1.5 2009/04/30 07:01:26 skrll Exp 
+ *     NetBSD: cpudevs,v 1.6 2012/02/26 07:50:37 skrll Exp 
  */
 
 #define        HPPA_TYPE_NPROC 0x00
@@ -230,6 +230,7 @@
 #define        HPPA_CPU_PCXL2  0x0f
 #define        HPPA_CPU_PCXUP  0x10
 #define        HPPA_CPU_PCXW   0x11
+#define        HPPA_CPU_PCXWP  0x12
 #define        HPPA_CPU_PCXW2  0x13
 #define        HPPA_FPU_SOFTEMU        0x01
 #define        HPPA_FPU_INDIGO 0x02
diff -r 2c0754074e06 -r e8ddae24eb58 sys/arch/hp700/dev/cpudevs_data.h
--- a/sys/arch/hp700/dev/cpudevs_data.h Mon Feb 27 20:13:30 2012 +0000
+++ b/sys/arch/hp700/dev/cpudevs_data.h Mon Feb 27 20:15:33 2012 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: cpudevs_data.h,v 1.7 2012/02/05 08:31:53 skrll Exp $   */
+/*     $NetBSD: cpudevs_data.h,v 1.7.2.1 2012/02/27 20:15:33 riz Exp $ */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
  * generated from:
- *     NetBSD: cpudevs,v 1.5 2009/04/30 07:01:26 skrll Exp 
+ *     NetBSD: cpudevs,v 1.6 2012/02/26 07:50:37 skrll Exp 
  */
 
 {HPPA_TYPE_BOARD,      HPPA_BOARD_HP840,       "840/930 (Indigo)" },
@@ -210,6 +210,7 @@
 {HPPA_TYPE_CPU,        HPPA_CPU_PCXL2, "PCXL2 (Velociraptor)" },
 {HPPA_TYPE_CPU,        HPPA_CPU_PCXUP, "PCXU+ (Vulcan)" },
 {HPPA_TYPE_CPU,        HPPA_CPU_PCXW,  "PCXW (Vulcan)" },
+{HPPA_TYPE_CPU,        HPPA_CPU_PCXWP, "PCXW+ (Landshark)" },
 {HPPA_TYPE_CPU,        HPPA_CPU_PCXW2, "PCXW2 (Piranha)" },
 {HPPA_TYPE_FPU,        HPPA_FPU_SOFTEMU,       "Software Emulation" },
 {HPPA_TYPE_FPU,        HPPA_FPU_INDIGO,        "Indigo" },
diff -r 2c0754074e06 -r e8ddae24eb58 sys/arch/hp700/hp700/machdep.c
--- a/sys/arch/hp700/hp700/machdep.c    Mon Feb 27 20:13:30 2012 +0000
+++ b/sys/arch/hp700/hp700/machdep.c    Mon Feb 27 20:15:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.107.2.1 2012/02/24 16:57:35 riz Exp $    */
+/*     $NetBSD: machdep.c,v 1.107.2.2 2012/02/27 20:15:33 riz Exp $    */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107.2.1 2012/02/24 16:57:35 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107.2.2 2012/02/27 20:15:33 riz Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -384,7 +384,7 @@
 #endif
 #ifdef HP8600_CPU
        { "PA8600", "Landshark", "PCXW+",
-         hpcxwp, HPPA_CPU_PCXW2 /*XXX NH */,
+         hpcxwp, HPPA_CPU_PCXWP,
          HPPA_FTRS_W32B, "2.0",
          desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
          ibtlb_u, NULL, pbtlb_u, NULL },