Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/sys/arch Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/8dc6b85e1beb
branches: nathanw_sa
changeset: 506652:8dc6b85e1beb
user: thorpej <thorpej%NetBSD.org@localhost>
date: Fri Jan 03 16:50:07 2003 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/powerpc/conf/Makefile.powerpc | 12 ++++++++--
sys/arch/powerpc/ibm4xx/dev/opb.c | 8 +++---
sys/arch/powerpc/ibm4xx/dev/plb.c | 6 ++--
sys/arch/prep/dev/obio.c | 12 +++++-----
sys/arch/prep/pci/pcib.c | 4 +-
sys/arch/prep/prep/mainbus.c | 6 ++--
sys/arch/sandpoint/pci/pcib.c | 4 +-
sys/arch/sandpoint/sandpoint/mainbus.c | 6 ++--
sys/arch/sbmips/sbmips/zbbus.c | 8 +++---
sys/arch/sgimips/dev/imc.c | 4 +-
sys/arch/sgimips/dev/mace.c | 8 +++---
sys/arch/sgimips/dev/zs.c | 6 ++--
sys/arch/sgimips/gio/gio.c | 6 ++--
sys/arch/sgimips/pci/macepci.c | 6 ++--
sys/arch/sgimips/sgimips/autoconf.c | 38 ++++++++++++++++++++++++---------
sys/arch/sgimips/sgimips/mainbus.c | 4 +-
sys/arch/shark/conf/Makefile.shark.inc | 3 +-
sys/arch/shark/include/param.h | 6 +----
18 files changed, 83 insertions(+), 64 deletions(-)
diffs (truncated from 440 to 300 lines):
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/powerpc/conf/Makefile.powerpc
--- a/sys/arch/powerpc/conf/Makefile.powerpc Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/powerpc/conf/Makefile.powerpc Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.19.2.6 2002/08/27 23:45:03 nathanw Exp $
+# $NetBSD: Makefile.powerpc,v 1.19.2.7 2003/01/03 16:50:07 thorpej Exp $
#
# Makefile for NetBSD
#
@@ -69,13 +69,19 @@
LINKFORMAT= -N
ENTRYPOINT= __start
+.if defined(NEED_SYMTAB)
+SYSTEM_LD_TAIL_EXTRA=; \
+ echo ${DBSYM} $@; \
+ ${DBSYM} $@
+.endif
+
.if defined(NEED_SREC)
-SYSTEM_LD_TAIL_EXTRA=; \
+SYSTEM_LD_TAIL_EXTRA+=; \
${OBJCOPY} -v -O srec $@ $@.srec
.endif
.if defined(NEED_BINARY)
-SYSTEM_LD_TAIL_EXTRA=; \
+SYSTEM_LD_TAIL_EXTRA+=; \
${OBJCOPY} -v -O binary $@ $@.bin
.endif
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/powerpc/ibm4xx/dev/opb.c
--- a/sys/arch/powerpc/ibm4xx/dev/opb.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/opb.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: opb.c,v 1.2.2.4 2002/10/18 02:39:30 nathanw Exp $ */
+/* $NetBSD: opb.c,v 1.2.2.5 2003/01/03 16:50:08 thorpej Exp $ */
/*
* Copyright 2001,2002 Wasabi Systems, Inc.
@@ -161,12 +161,12 @@
struct opb_attach_args *oaa = aux;
if (pnp)
- printf("%s at %s", oaa->opb_name, pnp);
+ aprint_normal("%s at %s", oaa->opb_name, pnp);
if (oaa->opb_addr != OPBCF_ADDR_DEFAULT)
- printf(" addr 0x%08lx", oaa->opb_addr);
+ aprint_normal(" addr 0x%08lx", oaa->opb_addr);
if (oaa->opb_irq != OPBCF_IRQ_DEFAULT)
- printf(" irq %d", oaa->opb_irq);
+ aprint_normal(" irq %d", oaa->opb_irq);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/powerpc/ibm4xx/dev/plb.c
--- a/sys/arch/powerpc/ibm4xx/dev/plb.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/plb.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.1.2.4 2002/10/18 02:39:30 nathanw Exp $ */
+/* $NetBSD: plb.c,v 1.1.2.5 2003/01/03 16:50:08 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -151,9 +151,9 @@
struct plb_attach_args *paa = aux;
if (pnp)
- printf("%s at %s", paa->plb_name, pnp);
+ aprint_normal("%s at %s", paa->plb_name, pnp);
if (paa->plb_irq != PLBCF_IRQ_DEFAULT)
- printf(" irq %d", paa->plb_irq);
+ aprint_normal(" irq %d", paa->plb_irq);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/prep/dev/obio.c
--- a/sys/arch/prep/dev/obio.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/prep/dev/obio.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.6.2.2 2002/10/18 03:17:59 nathanw Exp $ */
+/* $NetBSD: obio.c,v 1.6.2.3 2003/01/03 16:50:09 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -118,15 +118,15 @@
struct obio_attach_args *oa = args;
if (oa->oa_iosize)
- printf(" port 0x%x", oa->oa_iobase);
+ aprint_normal(" port 0x%x", oa->oa_iobase);
if (oa->oa_iosize > 1)
- printf("-0x%x", oa->oa_iobase + oa->oa_iosize - 1);
+ aprint_normal("-0x%x", oa->oa_iobase + oa->oa_iosize - 1);
if (oa->oa_msize)
- printf(" mem 0x%x", oa->oa_maddr);
+ aprint_normal(" mem 0x%x", oa->oa_maddr);
if (oa->oa_msize > 1)
- printf("-0x%x", oa->oa_maddr + oa->oa_msize - 1);
+ aprint_normal("-0x%x", oa->oa_maddr + oa->oa_msize - 1);
if (oa->oa_irq != IRQUNK)
- printf(" irq %d", oa->oa_irq);
+ aprint_normal(" irq %d", oa->oa_irq);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/prep/pci/pcib.c
--- a/sys/arch/prep/pci/pcib.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/prep/pci/pcib.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.5.6.2 2002/10/18 02:39:35 nathanw Exp $ */
+/* $NetBSD: pcib.c,v 1.5.6.3 2003/01/03 16:50:09 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -180,6 +180,6 @@
/* Only ISAs can attach to pcib's; easy. */
if (pnp)
- printf("isa at %s", pnp);
+ aprint_normal("isa at %s", pnp);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/prep/prep/mainbus.c
--- a/sys/arch/prep/prep/mainbus.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/prep/prep/mainbus.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4.8.5 2002/10/18 02:39:35 nathanw Exp $ */
+/* $NetBSD: mainbus.c,v 1.4.8.6 2003/01/03 16:50:09 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -171,9 +171,9 @@
union mainbus_attach_args *mba = aux;
if (pnp)
- printf("%s at %s", mba->mba_busname, pnp);
+ aprint_normal("%s at %s", mba->mba_busname, pnp);
if (!strcmp(mba->mba_busname, "pci"))
- printf(" bus %d", mba->mba_pba.pba_bus);
+ aprint_normal(" bus %d", mba->mba_pba.pba_bus);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sandpoint/pci/pcib.c
--- a/sys/arch/sandpoint/pci/pcib.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sandpoint/pci/pcib.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.3.6.2 2002/10/18 02:39:36 nathanw Exp $ */
+/* $NetBSD: pcib.c,v 1.3.6.3 2003/01/03 16:50:10 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -138,6 +138,6 @@
/* Only ISAs can attach to pcib's; easy. */
if (pnp)
- printf("isa at %s", pnp);
+ aprint_normal("isa at %s", pnp);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sandpoint/sandpoint/mainbus.c
--- a/sys/arch/sandpoint/sandpoint/mainbus.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sandpoint/sandpoint/mainbus.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5.6.4 2002/10/18 02:39:37 nathanw Exp $ */
+/* $NetBSD: mainbus.c,v 1.5.6.5 2003/01/03 16:50:10 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -164,8 +164,8 @@
union mainbus_attach_args *mba = aux;
if (pnp)
- printf("%s at %s", mba->mba_busname, pnp);
+ aprint_normal("%s at %s", mba->mba_busname, pnp);
if (!strcmp(mba->mba_busname, "pci"))
- printf(" bus %d", mba->mba_pba.pba_bus);
+ aprint_normal(" bus %d", mba->mba_pba.pba_bus);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sbmips/sbmips/zbbus.c
--- a/sys/arch/sbmips/sbmips/zbbus.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sbmips/sbmips/zbbus.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: zbbus.c,v 1.1.12.2 2002/10/18 02:39:37 nathanw Exp $ */
+/* $NetBSD: zbbus.c,v 1.1.12.3 2003/01/03 16:50:10 thorpej Exp $ */
/*
* Copyright 2000, 2001
@@ -98,9 +98,9 @@
struct zbbus_attach_args *zap = aux;
if (pnp)
- printf("%s at %s",
- zbbus_entity_type_name(zap->za_locs.za_type), pnp);
- printf(" busid %d", zap->za_locs.za_busid);
+ aprint_normal("%s at %s",
+ zbbus_entity_type_name(zap->za_locs.za_type), pnp);
+ aprint_normal(" busid %d", zap->za_locs.za_busid);
return (UNCONF);
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sgimips/dev/imc.c
--- a/sys/arch/sgimips/dev/imc.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sgimips/dev/imc.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imc.c,v 1.3.4.3 2002/10/18 02:39:38 nathanw Exp $ */
+/* $NetBSD: imc.c,v 1.3.4.4 2003/01/03 16:50:11 thorpej Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -197,7 +197,7 @@
struct imc_attach_args* iaa = aux;
if (name)
- printf("%s at %s", iaa->iaa_name, name);
+ aprint_normal("%s at %s", iaa->iaa_name, name);
return UNCONF;
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sgimips/dev/mace.c
--- a/sys/arch/sgimips/dev/mace.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sgimips/dev/mace.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mace.c,v 1.3.4.3 2002/10/18 02:39:38 nathanw Exp $ */
+/* $NetBSD: mace.c,v 1.3.4.4 2003/01/03 16:50:11 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -115,12 +115,12 @@
return QUIET;
if (maa->maa_offset != MACECF_OFFSET_DEFAULT)
- printf(" offset 0x%lx", maa->maa_offset);
+ aprint_normal(" offset 0x%lx", maa->maa_offset);
if (maa->maa_intr != MACECF_INTR_DEFAULT)
- printf(" intr %d", maa->maa_intr);
+ aprint_normal(" intr %d", maa->maa_intr);
#if 0
if (maa->maa_offset != MACECF_STRIDE_DEFAULT)
- printf(" stride 0x%lx", maa->maa_stride);
+ aprint_normal(" stride 0x%lx", maa->maa_stride);
#endif
return UNCONF;
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sgimips/dev/zs.c
--- a/sys/arch/sgimips/dev/zs.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sgimips/dev/zs.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.5.8.6 2002/10/18 02:39:39 nathanw Exp $ */
+/* $NetBSD: zs.c,v 1.5.8.7 2003/01/03 16:50:11 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -354,10 +354,10 @@
struct zsc_attach_args *args = aux;
if (name != NULL)
- printf("%s: ", name);
+ aprint_normal("%s: ", name);
if (args->channel != -1)
- printf(" channel %d", args->channel);
+ aprint_normal(" channel %d", args->channel);
return UNCONF;
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sgimips/gio/gio.c
--- a/sys/arch/sgimips/gio/gio.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sgimips/gio/gio.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gio.c,v 1.1.14.3 2002/11/11 22:03:50 nathanw Exp $ */
+/* $NetBSD: gio.c,v 1.1.14.4 2003/01/03 16:50:11 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -93,9 +93,9 @@
return QUIET;
if (ga->ga_slot != GIOCF_SLOT_DEFAULT)
- printf(" slot %d", ga->ga_slot);
+ aprint_normal(" slot %d", ga->ga_slot);
if (ga->ga_addr != (uint32_t) GIOCF_ADDR_DEFAULT)
- printf(" addr 0x%x", ga->ga_addr);
+ aprint_normal(" addr 0x%x", ga->ga_addr);
return UNCONF;
}
diff -r fc80769924c8 -r 8dc6b85e1beb sys/arch/sgimips/pci/macepci.c
--- a/sys/arch/sgimips/pci/macepci.c Fri Jan 03 16:38:36 2003 +0000
+++ b/sys/arch/sgimips/pci/macepci.c Fri Jan 03 16:50:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: macepci.c,v 1.3.14.3 2002/10/18 02:39:42 nathanw Exp $ */
+/* $NetBSD: macepci.c,v 1.3.14.4 2003/01/03 16:50:12 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -161,9 +161,9 @@
Home |
Main Index |
Thread Index |
Old Index