[src/trunk]: src/sys Update several ports to at least work again without IPKDB

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

details:   https://anonhg.NetBSD.org/src/rev/24896919b9b0
branches:  trunk
changeset: 484061:24896919b9b0
user:      ws <ws%NetBSD.org@localhost>
date:      Fri Mar 24 17:05:30 2000 +0000

description:
Update several ports to at least work again without IPKDB
after the update of that.
Sorry for breaking this with my last changes :-(.
Fixes PR#9671 by Lennart Augustsson.

diffstat:

 sys/arch/arm32/arm32/exception.S            |  10 +++++-----
 sys/arch/arm32/arm32/locore.S               |   6 +++---
 sys/arch/arm32/arm32/machdep.c              |   4 ++--
 sys/arch/arm32/footbridge/ebsa285_machdep.c |   8 ++++----
 sys/arch/arm32/ofw/ofwgencfg_machdep.c      |   4 ++--
 sys/arch/arm32/rc7500/rc7500_machdep.c      |   8 ++++----
 sys/arch/arm32/riscpc/rpc_machdep.c         |   8 ++++----
 sys/arch/arm32/shark/shark_machdep.c        |   4 ++--
 sys/arch/bebox/bebox/locore.s               |  12 ++++++------
 sys/arch/bebox/bebox/machdep.c              |  12 ++++++------
 sys/arch/macppc/macppc/locore.S             |  12 ++++++------
 sys/arch/macppc/macppc/machdep.c            |  12 ++++++------
 sys/arch/ofppc/ofppc/locore.S               |  12 ++++++------
 sys/arch/ofppc/ofppc/machdep.c              |  12 ++++++------
 sys/arch/prep/prep/locore.s                 |  12 ++++++------
 sys/dev/ofw/files.ofw                       |   8 +++-----
 16 files changed, 71 insertions(+), 73 deletions(-)

diffs (truncated from 635 to 300 lines):

diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/arm32/exception.S
--- a/sys/arch/arm32/arm32/exception.S  Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/arm32/exception.S  Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exception.S,v 1.13 1999/10/26 06:53:41 cgd Exp $       */
+/*     $NetBSD: exception.S,v 1.14 2000/03/24 17:05:30 ws Exp $        */
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -45,7 +45,7 @@
  * Based on kate/display/abort.s
  */
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 #include <machine/asm.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
@@ -227,7 +227,7 @@
  */
 
 ASENTRY_NP(undefined_entry)
-#if NIPKDB > 0
+#ifdef IPKDB
 /*
  * IPKDB must be hooked in at the earliest possible entry point.
  *
@@ -350,7 +350,7 @@
        str     r1, [r0, #0x0004]
        ldmia   r0, {r0, r1, pc}
 
-#if NIPKDB > 0
+#ifdef IPKDB
 Lipkdb_trap_return:
        .word   Lipkdb_trap_return_data
 #endif
@@ -374,7 +374,7 @@
        .data
        .align  0
 
-#if NIPKDB > 0
+#ifdef IPKDB
 Lipkdb_trap_return_data:
        .word   0
 #endif
diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/arm32/locore.S
--- a/sys/arch/arm32/arm32/locore.S     Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/arm32/locore.S     Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.33 1999/10/26 06:53:41 cgd Exp $  */
+/*     $NetBSD: locore.S,v 1.34 2000/03/24 17:05:30 ws Exp $   */
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 #include "assym.h"
 #include <sys/syscall.h>
 #include <sys/errno.h>
@@ -235,7 +235,7 @@
         .global _C_LABEL(esigcode)
 _C_LABEL(esigcode):
 
-#if    NIPKDB > 0
+#ifdef IPKDB
 #if    0
 /*
  * ipkdbfbyte and ipkdbsbyte are now in ipkdb_glue.c and do not tweak
diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/arm32/machdep.c
--- a/sys/arch/arm32/arm32/machdep.c    Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/arm32/machdep.c    Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.75 2000/03/06 03:15:47 mark Exp $        */
+/*     $NetBSD: machdep.c,v 1.76 2000/03/24 17:05:30 ws Exp $  */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -78,7 +78,7 @@
 #include <machine/pte.h>
 #include <machine/bootconfig.h>
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 #include "md.h"
 #include "opt_mdsize.h"
 
diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/footbridge/ebsa285_machdep.c
--- a/sys/arch/arm32/footbridge/ebsa285_machdep.c       Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/footbridge/ebsa285_machdep.c       Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ebsa285_machdep.c,v 1.10 2000/01/10 07:43:07 mark Exp $        */
+/*     $NetBSD: ebsa285_machdep.c,v 1.11 2000/03/24 17:05:31 ws Exp $  */
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -72,7 +72,7 @@
 #include <arm32/footbridge/dc21285mem.h>
 #include <arm32/footbridge/dc21285reg.h>
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 
 #include "isa.h"
 #if NISA > 0
@@ -95,7 +95,7 @@
 /* Define various stack sizes in pages */
 #define IRQ_STACK_SIZE 1
 #define ABT_STACK_SIZE 1
-#if NIPKDB > 0
+#ifdef IPKDB
 #define UND_STACK_SIZE 2
 #else
 #define UND_STACK_SIZE 1
@@ -734,7 +734,7 @@
        irq_init();
        printf("done.\n");
 
-#if NIPKDB > 0
+#ifdef IPKDB
        /* Initialise ipkdb */
        ipkdb_init();
        if (boothowto & RB_KDB)
diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/ofw/ofwgencfg_machdep.c
--- a/sys/arch/arm32/ofw/ofwgencfg_machdep.c    Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/ofw/ofwgencfg_machdep.c    Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofwgencfg_machdep.c,v 1.10 1999/01/03 02:23:28 mark Exp $      */
+/*     $NetBSD: ofwgencfg_machdep.c,v 1.11 2000/03/24 17:05:31 ws Exp $        */
 
 /*
  * Copyright 1997
@@ -63,7 +63,7 @@
 #include <machine/pte.h>
 #include <machine/undefined.h>
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 
 #include <dev/ofw/openfirm.h>
 #include <machine/ofw.h>
diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/rc7500/rc7500_machdep.c
--- a/sys/arch/arm32/rc7500/rc7500_machdep.c    Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/rc7500/rc7500_machdep.c    Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rc7500_machdep.c,v 1.26 2000/03/13 23:52:27 soren Exp $        */
+/*     $NetBSD: rc7500_machdep.c,v 1.27 2000/03/24 17:05:31 ws Exp $   */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -79,7 +79,7 @@
 #include <machine/rtc.h>
 #include <arm32/iomd/iomdreg.h>
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 
 #ifdef RC7500
 #include <arm32/rc7500/rc7500_prom.h>
@@ -97,7 +97,7 @@
 #define FIQ_STACK_SIZE 1
 #define IRQ_STACK_SIZE 1
 #define ABT_STACK_SIZE 1
-#if NIPKDB > 0
+#ifdef IPKDB
 #define UND_STACK_SIZE 2
 #else
 #define UND_STACK_SIZE 1
@@ -920,7 +920,7 @@
        irq_init();
        printf("done.\n");
 
-#if NIPKDB > 0
+#ifdef IPKDB
        /* Initialise ipkdb */
        ipkdb_init();
        if (boothowto & RB_KDB)
diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/riscpc/rpc_machdep.c
--- a/sys/arch/arm32/riscpc/rpc_machdep.c       Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/riscpc/rpc_machdep.c       Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_machdep.c,v 1.32 2000/03/13 23:52:27 soren Exp $   */
+/*     $NetBSD: rpc_machdep.c,v 1.33 2000/03/24 17:05:32 ws Exp $      */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -80,7 +80,7 @@
 #include <machine/rtc.h>
 #include <arm32/iomd/iomdreg.h>
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 #ifdef HYDRA
 #include "hydrabus.h"
 #endif /* HYDRA */
@@ -96,7 +96,7 @@
 /* Define various stack sizes in pages */
 #define IRQ_STACK_SIZE 1
 #define ABT_STACK_SIZE 1
-#if NIPKDB > 0
+#ifdef IPKDB
 #define UND_STACK_SIZE 2
 #else
 #define UND_STACK_SIZE 1
@@ -1130,7 +1130,7 @@
                rpc_sa110_cc_setup();   
 #endif /* CPU_SA110 */
 
-#if NIPKDB > 0
+#ifdef IPKDB
        /* Initialise ipkdb */
        ipkdb_init();
        if (boothowto & RB_KDB)
diff -r 329285943d3a -r 24896919b9b0 sys/arch/arm32/shark/shark_machdep.c
--- a/sys/arch/arm32/shark/shark_machdep.c      Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/arm32/shark/shark_machdep.c      Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shark_machdep.c,v 1.14 1999/03/19 05:13:17 cgd Exp $   */
+/*     $NetBSD: shark_machdep.c,v 1.15 2000/03/24 17:05:32 ws Exp $    */
 
 /*
  * Copyright 1997
@@ -65,7 +65,7 @@
 #include <machine/pte.h>
 #include <machine/undefined.h>
 
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 
 #include <dev/ofw/openfirm.h>
 #include <machine/ofw.h>
diff -r 329285943d3a -r 24896919b9b0 sys/arch/bebox/bebox/locore.s
--- a/sys/arch/bebox/bebox/locore.s     Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/bebox/bebox/locore.s     Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.13 2000/01/19 03:28:23 danw Exp $ */
+/*     $NetBSD: locore.s,v 1.14 2000/03/24 17:05:32 ws Exp $   */
 /*     $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $       */
 
 /*
@@ -34,7 +34,7 @@
 
 #include "opt_ddb.h"
 #include "fs_kernfs.h"
-#include "ipkdb.h"
+#include "opt_ipkdb.h"
 #include "assym.h"
 
 #include <sys/syscall.h>
@@ -761,7 +761,7 @@
 _C_LABEL(ddbsize) = .-_C_LABEL(ddblow)
 #endif /* DDB */
 
-#if NIPKDB > 0
+#ifdef IPKDB
 #define        ipkdbsave       0xde0           /* primary save area for IPKDB */
 /*
  * In case of IPKDB we want a separate trap catcher for it
@@ -780,7 +780,7 @@
        addi    1,1,ipkdbstk+INTSTK@l
        bla     ipkdbtrap
 _C_LABEL(ipkdbsize) = .-_C_LABEL(ipkdblow)
-#endif /* NIPKDB > 0 */
+#endif /* IPKDB */
 
 /*
  * FRAME_SETUP assumes:
@@ -1189,7 +1189,7 @@
        rfi
 #endif /* DDB */
 
-#if NIPKDB > 0
+#ifdef IPKDB
 /*
  * Deliberate entry to ipkdbtrap
  */
@@ -1299,7 +1299,7 @@
        sync
        icbi    0,9                     /* and instruction caches */    
        blr
-#endif /* NIPKDB > 0 */
+#endif /* IPKDB */
        
 /*
  * int setfault()
diff -r 329285943d3a -r 24896919b9b0 sys/arch/bebox/bebox/machdep.c
--- a/sys/arch/bebox/bebox/machdep.c    Fri Mar 24 14:37:46 2000 +0000
+++ b/sys/arch/bebox/bebox/machdep.c    Fri Mar 24 17:05:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.49 2000/02/21 20:38:47 erh Exp $ */
+/*     $NetBSD: machdep.c,v 1.50 2000/03/24 17:05:32 ws Exp $  */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -37,7 +37,7 @@
 #include "opt_ccitt.h"
 #include "opt_iso.h"