Subject: improved Alchemy support patch
To: Simon Burge <simonb@wasabisystems.com>
From: Garrett D'Amore <garrett_damore@tadpole.com>
List: port-evbmips
Date: 11/15/2005 16:27:13
This is a multi-part message in MIME format.
--------------070905000905050304020006
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Based upon the discussions we've had so far, I'm attaching a patch that
cleans up the Alchemy support in the evbmips tree somewhat.
This patch is "incremental" -- meaning you need to have the other
patches I've submitted applied, with the notable exception of the move
of yamon -- that is in a different tree right now.
Here's what the patch does:
1) provides a generic ALCHEMY config that provides support for all
Alchemy parts I know about (notably this excludes the Au1200, but that
can probably be easily rectified if someone has an Au1200 or wants to
donate one to me. :-) In this case, "generic" support means that
ethernet, serial, and USB devices are supported. NO other onboard
peripherials are supported.
2) provides "stub" ZINFANDEL and CABERNET configs for Au1500 and Au1550
parts. Right now these don't do much besides some basic validation, but
I'll be adding additional peripheral support (PCI!) to these VERY soon.
3) removes hard coded serial speed -- instead the YAMON environment is
queried for it. A default speed can still be supplied, but it allows
sites to change this by just doing setenv in YAMON.
4) removes the clocking logic for USB, which *FIXES* the USB support for
the AU1550. YAMON (2.23 at least) sets the clocks for USB up properly,
and the logic in the old machdep code was busted for the Au1550. Now it
works.
5) Removes all the remaining crufty pb1000 references. Everything that
is alchemy generic is so named.
I have not submitted a PR for this yet, but obviously I'd like to see
these get committed. But I want to give folks a chance to review before
I start the official process. Thanks!
--
Garrett D'Amore http://www.tadpolecomputer.com/
Sr. Staff Engineer Extending the Power of 64-bit UNIX Computing
Tadpole Computer, Inc. Phone: (951) 325-2134
--------------070905000905050304020006
Content-Type: text/plain;
name="alchemy-diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="alchemy-diff"
? arch/evbmips/compile/obj
Index: arch/evbmips/alchemy/board.h
===================================================================
RCS file: arch/evbmips/alchemy/board.h
diff -N arch/evbmips/alchemy/board.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/alchemy/board.h 16 Nov 2005 00:15:48 -0000
@@ -0,0 +1,43 @@
+/* $NetBSD$ */
+
+/*-
+ * Copyright (c) 2005 Tadpole Computer Inc.
+ * All rights reserved.
+ *
+ * Written by Garrett D'Amore for Tadpole Computer Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of Tadpole Computer Inc. may not be used to endorse
+ * or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TADPOLE COMPUTER INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TADPOLE COMPUTER INC.
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _EVBMIPS_ALCHEMY_BOARD_H
+#define _EVBMIPS_ALCHEMY_BOARD_H
+
+/*
+ * Individual boards must define a board_init() routine that does any
+ * board specific initialization.
+ */
+extern void board_init(void);
+
+#endif /* _EVBMIPS_ALCHEMY_BOARD_H */
Index: arch/evbmips/alchemy/board_cabernet.c
===================================================================
RCS file: arch/evbmips/alchemy/board_cabernet.c
diff -N arch/evbmips/alchemy/board_cabernet.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/alchemy/board_cabernet.c 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,66 @@
+/* $NetBSD$ */
+
+/*-
+ * Copyright (c) 2005 Tadpole Computer Inc.
+ * All rights reserved.
+ *
+ * Written by Garrett D'Amore for Tadpole Computer Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of Tadpole Computer Inc. may not be used to endorse
+ * or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TADPOLE COMPUTER INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TADPOLE COMPUTER INC.
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <machine/bus.h>
+#include <machine/locore.h>
+#include <evbmips/alchemy/obiovar.h>
+#include <evbmips/alchemy/board.h>
+
+static obiodev_t cabernet_obio[] = {
+#if 0
+ { "aupcmcia", -1, -1 },
+ { "aupsc", -1, -1 },
+ { "aupsc", -1, -1 },
+ { "aupsc", -1, -1 },
+#endif
+ { NULL },
+};
+
+obiodev_t *
+obio_devices(void)
+{
+ return (cabernet_obio);
+}
+
+void
+board_init(void)
+{
+
+ if (MIPS_PRID_COPTS(cpu_id) != MIPS_AU1550)
+ panic("Cabernet: CPU not Au1550!");
+
+ /* leave console rate alone -- hopefully YAMON got it right! */
+}
+
Index: arch/evbmips/alchemy/board_generic.c
===================================================================
RCS file: arch/evbmips/alchemy/board_generic.c
diff -N arch/evbmips/alchemy/board_generic.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/alchemy/board_generic.c 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,62 @@
+/* $NetBSD$ */
+
+/*-
+ * Copyright (c) 2005 Tadpole Computer Inc.
+ * All rights reserved.
+ *
+ * Written by Garrett D'Amore for Tadpole Computer Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of Tadpole Computer Inc. may not be used to endorse
+ * or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TADPOLE COMPUTER INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TADPOLE COMPUTER INC.
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <machine/bus.h>
+#include <evbmips/alchemy/obiovar.h>
+#include <evbmips/alchemy/board.h>
+
+/*
+ * Generically, we have no OBIO devices.
+ */
+static obiodev_t generic_obio[] = {
+ { NULL },
+};
+
+obiodev_t *
+obio_devices(void)
+{
+
+ return (generic_obio);
+}
+
+void
+board_init(void)
+{
+
+ strcpy(cpu_model, "Generic Alchemy Board");
+
+ /* leave console rate alone -- hopefully YAMON got it right! */
+}
+
Index: arch/evbmips/alchemy/board_zinfandel.c
===================================================================
RCS file: arch/evbmips/alchemy/board_zinfandel.c
diff -N arch/evbmips/alchemy/board_zinfandel.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/alchemy/board_zinfandel.c 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,76 @@
+/* $NetBSD$ */
+
+/*-
+ * Copyright (c) 2005 Tadpole Computer Inc.
+ * All rights reserved.
+ *
+ * Written by Garrett D'Amore for Tadpole Computer Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of Tadpole Computer Inc. may not be used to endorse
+ * or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TADPOLE COMPUTER INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TADPOLE COMPUTER INC.
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <machine/bus.h>
+#include <machine/locore.h>
+#include <evbmips/alchemy/obiovar.h>
+#include <evbmips/alchemy/board.h>
+
+static obiodev_t zinfandel_obio[] = {
+#if 0
+ { "aupcmcia", -1, -1 },
+ { "auaudio", -1, -1 },
+#endif
+ { NULL },
+};
+
+obiodev_t *
+obio_devices(void)
+{
+
+ return (zinfandel_obio);
+}
+
+void
+board_init(void)
+{
+ uint32_t whoami;
+
+ if (MIPS_PRID_COPTS(cpu_id) != MIPS_AU1500)
+ panic("Zinfandel: CPU not Au1500!");
+
+ whoami = *((volatile uint32_t *)0xAE000000);
+ if (((whoami >> 8) & 0xffff) != 0x6)
+ panic("Zinfandel: board type mismatch (WHOAMI %x)", whoami);
+
+ printf("Zinfandel: CPLD v%d, ", (whoami >> 4) & 0xf);
+ if ((whoami & 0xf) != 0xf)
+ printf("daughtercard 0x%x\n", whoami & 0xf);
+ else
+ printf("no daughtercard\n");
+
+ /* leave console rate alone -- hopefully YAMON got it right! */
+}
+
Index: arch/evbmips/alchemy/mach_intr.c
===================================================================
RCS file: arch/evbmips/alchemy/mach_intr.c
diff -N arch/evbmips/alchemy/mach_intr.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/alchemy/mach_intr.c 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,79 @@
+/* $NetBSD$ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Platform-specific interrupt support for the Alchemy Parts.
+ *
+ * These boards just use the interrupt controller built into the
+ * Alchemy processors, so we just provide evbmips-compliant wrapper
+ * routines.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pb1000_intr.c,v 1.2 2003/07/15 01:37:31 lukem Exp $");
+
+#include "opt_ddb.h"
+
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <mips/locore.h>
+#include <mips/alchemy/include/auvar.h>
+#include <mips/alchemy/include/aubusvar.h>
+
+void
+evbmips_intr_init(void)
+{
+
+ au_intr_init();
+}
+
+void
+evbmips_iointr(u_int32_t status, u_int32_t cause, u_int32_t pc,
+ u_int32_t ipending)
+{
+
+ au_iointr(status, cause, pc, ipending);
+}
Index: arch/evbmips/alchemy/machdep.c
===================================================================
RCS file: /net/projects/meteor/cvs/netbsd/src/sys/arch/evbmips/alchemy/machdep.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 machdep.c
--- arch/evbmips/alchemy/machdep.c 9 Nov 2005 14:17:15 -0000 1.1.1.1
+++ arch/evbmips/alchemy/machdep.c 16 Nov 2005 00:15:49 -0000
@@ -114,8 +114,9 @@
#include <mips/cache.h>
#include <mips/locore.h>
#include <machine/yamon.h>
+#include <machine/bus.h>
-#include <evbmips/alchemy/pb1000var.h>
+#include <evbmips/alchemy/board.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
#include <mips/alchemy/include/aubusvar.h>
@@ -124,10 +125,7 @@
#if NAUCOM > 0
#include <mips/alchemy/dev/aucomvar.h>
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-int aucomcnrate = CONSPEED;
+int aucomcnrate = 0;
#endif /* NAUCOM > 0 */
#include "ohci.h"
@@ -152,14 +150,29 @@
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
yamon_env_var *yamon_envp;
-struct pb1000_config pb1000_configuration;
+
+struct mips_bus_space alchemy_cpuregt;
void mach_init(int, char **, yamon_env_var *, u_long); /* XXX */
+/*
+ * XXX: A cleaner way would be to get this from the cpu table in the MIPS
+ * CPU handler code (or even better, have *that* code fill in cpu_model.)
+ */
+static struct {
+ int id;
+ const char *name;
+} cpus[] = {
+ { MIPS_AU1000, "Au1000" },
+ { MIPS_AU1100, "Au1100" },
+ { MIPS_AU1500, "Au1500" },
+ { MIPS_AU1550, "Au1550" },
+ { 0, NULL },
+};
+
void
mach_init(int argc, char **argv, yamon_env_var *envp, u_long memsize)
{
- struct pb1000_config *pbc = &pb1000_configuration;
bus_space_handle_t sh;
caddr_t kernend;
const char *cp;
@@ -173,9 +186,16 @@
kernend = (caddr_t)mips_round_page(end);
memset(edata, 0, kernend - (caddr_t)edata);
- /* set CPU model info for sysctl_hw */
- strcpy(cpu_model, "Alchemy Semiconductor Pb1000");
-
+ /* store CPU model info for sysctl_hw */
+ for (i = 0; cpus[i].name; i++) {
+ if (cpus[i].id == MIPS_PRID_COPTS(cpu_id)) {
+ sprintf(cpu_model, "AMD Alchemy %s", cpus[i].name);
+ break;
+ }
+ }
+ if (cpus[i].name == NULL)
+ strcpy(cpu_model, "Unknown AMD Alchemy");
+
/* save the yamon environment pointer */
yamon_envp = envp;
@@ -206,34 +226,61 @@
/*
* Initialize bus space tags.
*/
- au_cpureg_bus_mem_init(&pbc->pc_cpuregt, pbc);
- aubus_st = &pbc->pc_cpuregt; /* XXX: for aubus.c */
+ au_cpureg_bus_mem_init(&alchemy_cpuregt, &alchemy_cpuregt);
+ aubus_st = &alchemy_cpuregt;
/*
* Calibrate the timer if YAMON failed to tell us.
*/
if (!freqok) {
- bus_space_map(&pbc->pc_cpuregt, PC_BASE, PC_SIZE, 0, &sh);
- au_cal_timers(&pbc->pc_cpuregt, sh);
- bus_space_unmap(&pbc->pc_cpuregt, sh, PC_SIZE);
+ bus_space_map(aubus_st, PC_BASE, PC_SIZE, 0, &sh);
+ au_cal_timers(aubus_st, sh);
+ bus_space_unmap(aubus_st, sh, PC_SIZE);
}
/*
+ * Perform board-specific initialization.
+ */
+ board_init();
+
+ /*
* Bring up the console.
*/
#if NAUCOM > 0
+#ifdef CONSPEED
+ if (aucomcnrate == 0)
+ aucomcnrate = CONSPEED;
+#else /* CONSPEED */
+ /*
+ * Learn default console speed. We use the YAMON environment,
+ * though we could probably also figure it out by checking the
+ * aucom registers directly.
+ */
+ if ((aucomcnrate == 0) && ((cp = yamon_getenv("modetty0")) != NULL))
+ aucomcnrate = strtoul(cp, NULL, 0);
+
+ if (aucomcnrate == 0) {
+ printf("FATAL: `modetty0' YAMON variable not set. Set it\n");
+ printf(" to the speed of the console and try again.\n");
+ printf(" Or, build a kernel with the `CONSPEED' "
+ "option.\n");
+ panic("machdep");
+ }
+#endif /* CONSPEED */
+
/*
* Delay to allow firmware putchars to complete.
* FIFO depth * character time.
* character time = (1000000 / (defaultrate / 10))
*/
delay(160000000 / aucomcnrate);
- if (aucomcnattach(&pbc->pc_cpuregt, UART0_BASE, aucomcnrate,
+ /* fortunately, AMD has never moved UART0_BASE */
+ if (aucomcnattach(aubus_st, UART0_BASE, aucomcnrate,
curcpu()->ci_cpu_freq / 4, COM_TYPE_AU1x00,
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0)
- panic("pb1000: unable to initialize serial console");
-#else
- panic("pb1000: not configured to use serial console");
+ panic("mach_init: unable to initialize serial console");
+#else /* NAUCOM > 0 */
+ panic("mach_init: not configured to use serial console");
#endif /* NAUCOM > 0 */
/*
@@ -316,24 +363,6 @@
curpcb = &lwp0.l_addr->u_pcb;
curpcb->pcb_context[11] = MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
-#if NOHCI > 0
- {
-#define USBH_ALL (0x1f<<10) /* All relevant bits in USBH portion of SYS_CLKSRC */
- /*
- * Assign a clock for the USB Host controller.
- */
- volatile u_int32_t *scsreg, *auxpll;
- u_int32_t tmp;
-
- scsreg = (volatile u_int32_t *)(MIPS_PHYS_TO_KSEG1(SYS_CLKSRC));
- auxpll = (volatile u_int32_t *)(MIPS_PHYS_TO_KSEG1(SYS_AUXPLL));
- *auxpll = 8; /* 96Mhz */
- tmp = *scsreg;
- tmp &= ~USBH_ALL; /* clear all USBH bits in SYS_CLKSRC first */
- tmp |= (SCS_DUH|SCS_CUH|SCS_MUH(SCS_MEx_AUX)); /* 48Mhz */
- *scsreg = tmp;
- }
-#endif /* NOHCI */
/*
* Initialize debuggers, and break into them, if appropriate.
*/
Index: arch/evbmips/alchemy/obio.c
===================================================================
RCS file: arch/evbmips/alchemy/obio.c
diff -N arch/evbmips/alchemy/obio.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/alchemy/obio.c 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,118 @@
+/* $NetBSD$ */
+
+/*
+ * Copyright 2002 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Simon Burge for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+
+#include <machine/bus.h>
+
+#include <mips/cache.h>
+#include <mips/cpuregs.h>
+
+#include <evbmips/alchemy/obiovar.h>
+
+#include "locators.h"
+
+static int obio_match(struct device *, struct cfdata *, void *);
+static void obio_attach(struct device *, struct device *, void *);
+static int obio_submatch(struct device *, struct cfdata *,
+ const int *, void *);
+static int obio_print(void *, const char *);
+
+CFATTACH_DECL(obio, sizeof(struct device),
+ obio_match, obio_attach, NULL, NULL);
+
+/* There can be only one. */
+static int obio_found = 0;
+
+static int
+obio_match(struct device *parent, struct cfdata *match, void *aux)
+{
+
+ if (obio_found)
+ return (0);
+
+ return (1);
+}
+
+static void
+obio_attach(struct device *parent, struct device *self, void *aux)
+{
+ struct obio_attach_args oa;
+ struct obiodev *od;
+
+ obio_found = 1;
+ printf("\n");
+
+ for (od = obio_devices(); od->od_name != NULL; od++) {
+ oa.oba_name = od->od_name;
+ oa.oba_addr = od->od_addr;
+ oa.oba_irq = od->od_irq;
+ (void) config_found_sm_loc(self, "obio", NULL, &oa, obio_print,
+ obio_submatch);
+ }
+}
+
+static int
+obio_submatch(struct device *parent, struct cfdata *cf,
+ const int *ldesc, void *aux)
+{
+ struct obio_attach_args *oa = aux;
+
+ if (cf->cf_loc[OBIOCF_ADDR] != OBIOCF_ADDR_DEFAULT &&
+ cf->cf_loc[OBIOCF_ADDR] != oa->oba_addr)
+ return (0);
+
+ return (config_match(parent, cf, aux));
+}
+
+static int
+obio_print(void *aux, const char *pnp)
+{
+ struct obio_attach_args *oa = aux;
+
+ if (pnp)
+ aprint_normal("%s at %s", oa->oba_name, pnp);
+ if (oa->oba_addr != OBIOCF_ADDR_DEFAULT)
+ aprint_normal(" addr 0x%lx", oa->oba_addr);
+
+ return (UNCONF);
+}
Index: arch/evbmips/alchemy/obiovar.h
===================================================================
RCS file: arch/evbmips/alchemy/obiovar.h
diff -N arch/evbmips/alchemy/obiovar.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/alchemy/obiovar.h 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,56 @@
+/* $NetBSD$ */
+
+/*
+ * Copyright 2002 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Simon Burge for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _OBIOVAR_H_
+#define _OBIOVAR_H_
+
+typedef struct obio_attach_args {
+ const char *oba_name; /* name of device */
+ bus_space_tag_t oba_st; /* bus space tag */
+ bus_addr_t oba_addr; /* address of device */
+ int oba_irq; /* CPLD interrupt bit # */
+} obio_attach_args_t;
+
+typedef struct obiodev {
+ const char *od_name;
+ bus_addr_t od_addr;
+ int od_irq;
+} obiodev_t;
+
+struct obiodev *obio_devices(void);
+
+#endif /* _OBIOVAR_H_ */
Index: arch/evbmips/alchemy/pb1000_obio.c
===================================================================
RCS file: arch/evbmips/alchemy/pb1000_obio.c
diff -N arch/evbmips/alchemy/pb1000_obio.c
--- arch/evbmips/alchemy/pb1000_obio.c 9 Nov 2005 14:17:15 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,132 +0,0 @@
-/* $NetBSD: pb1000_obio.c,v 1.8 2005/08/26 13:19:35 drochner Exp $ */
-
-/*
- * Copyright 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Simon Burge for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pb1000_obio.c,v 1.8 2005/08/26 13:19:35 drochner Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-
-#include <machine/bus.h>
-
-#include <mips/cache.h>
-#include <mips/cpuregs.h>
-
-#include <evbmips/alchemy/pb1000reg.h>
-#include <evbmips/alchemy/pb1000_obiovar.h>
-
-#include "locators.h"
-
-static int obio_match(struct device *, struct cfdata *, void *);
-static void obio_attach(struct device *, struct device *, void *);
-static int obio_submatch(struct device *, struct cfdata *,
- const int *, void *);
-static int obio_print(void *, const char *);
-
-CFATTACH_DECL(obio, sizeof(struct device),
- obio_match, obio_attach, NULL, NULL);
-
-/* There can be only one. */
-int obio_found;
-
-struct obiodev {
- const char *od_name;
- bus_addr_t od_addr;
- int od_irq;
-};
-
-struct obiodev obiodevs[] = {
- { "pcmcia", -1, -1 },
- { "lcd", -1, -1 },
- { "flash", -1, -1 },
- { NULL, 0, 0 },
-};
-
-static int
-obio_match(struct device *parent, struct cfdata *match, void *aux)
-{
-
- if (obio_found)
- return (0);
-
- return (1);
-}
-
-static void
-obio_attach(struct device *parent, struct device *self, void *aux)
-{
- struct obio_attach_args oa;
- struct obiodev *od;
-
- obio_found = 1;
- printf("\n");
-
- for (od = obiodevs; od->od_name != NULL; od++) {
- oa.oba_name = od->od_name;
- oa.oba_addr = od->od_addr;
- oa.oba_irq = od->od_irq;
- (void) config_found_sm_loc(self, "obio", NULL, &oa, obio_print,
- obio_submatch);
- }
-}
-
-static int
-obio_submatch(struct device *parent, struct cfdata *cf,
- const int *ldesc, void *aux)
-{
- struct obio_attach_args *oa = aux;
-
- if (cf->cf_loc[OBIOCF_ADDR] != OBIOCF_ADDR_DEFAULT &&
- cf->cf_loc[OBIOCF_ADDR] != oa->oba_addr)
- return (0);
-
- return (config_match(parent, cf, aux));
-}
-
-static int
-obio_print(void *aux, const char *pnp)
-{
- struct obio_attach_args *oa = aux;
-
- if (pnp)
- aprint_normal("%s at %s", oa->oba_name, pnp);
- if (oa->oba_addr != OBIOCF_ADDR_DEFAULT)
- aprint_normal(" addr 0x%lx", oa->oba_addr);
-
- return (UNCONF);
-}
Index: arch/evbmips/alchemy/pb1000reg.h
===================================================================
RCS file: arch/evbmips/alchemy/pb1000reg.h
diff -N arch/evbmips/alchemy/pb1000reg.h
--- arch/evbmips/alchemy/pb1000reg.h 9 Nov 2005 14:17:15 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,69 +0,0 @@
-/* $NetBSD: pb1000reg.h,v 1.1 2002/07/29 16:22:59 simonb Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Memory map and register definitions for the Alchemy Semiconductor Pb1000.
- */
-
-/* RAM addresses */
-#define PB1000_SDRAM_BASE 0x00000000
-#define PB1000_SDRAM_SIZE 0x04000000
-
-/* Static RAM */
-#define PB1000_SRAM_BASE 0x1c000000
-#define PB1000_SRAM_SIZE 0x00040000
-
-/* PCMCIA addresses */
-#define PB1000_PCMCIA_CONTROL 0x1e000000
-#define PB1000_PCMCIA_DATA 0x1e000004
-#define PB1000_PCMCIA_STATUS 0x1e000008
-
-/* CPLD addresses */
-#define PB1000_CPLD_AUX0 0x1e00000c
-#define PB1000_CPLD_AUX1 0x1e000010
-#define PB1000_CPLD_AUX2 0x1e000014
-
-/* Flash addresses */
-#define PB1000_FLASH_BASE 0x1f800000
-#define PB1000_FLASH_SIZE 0x00800000
-
-#define LCD_BASE 0xe ## 00000000
-#define LCD_SIZE 0x1 ## 00000000
-
-#define PCMCIA_BASE 0xf ## 00000000
-#define PCMCIA_SIZE 0x1 ## 00000000
Index: arch/evbmips/alchemy/pb1000var.h
===================================================================
RCS file: arch/evbmips/alchemy/pb1000var.h
diff -N arch/evbmips/alchemy/pb1000var.h
--- arch/evbmips/alchemy/pb1000var.h 9 Nov 2005 14:17:15 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-/* $NetBSD: pb1000var.h,v 1.1 2002/07/29 16:22:59 simonb Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/bus.h>
-
-#include <mips/alchemy/include/auvar.h>
-#include <mips/alchemy/include/aubusvar.h>
-
-struct pb1000_config {
- struct mips_bus_space pc_cpuregt;
-};
-
-#ifdef _KERNEL
-extern struct pb1000_config pb1000_configuration;
-
-void *pb1000_intr_establish(int, int, int, int, int (*)(void *), void *);
-void pb1000_intr_disestablish(void *);
-#endif /* _KERNEL */
Index: arch/evbmips/conf/ALCHEMY
===================================================================
RCS file: arch/evbmips/conf/ALCHEMY
diff -N arch/evbmips/conf/ALCHEMY
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/conf/ALCHEMY 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,276 @@
+# $NetBSD$
+#
+# Kernel config for generic AMD Alchemy evaluation boards.
+
+include "arch/evbmips/conf/std.alchemy"
+
+#ident "ALCHEMY-$Revision: 1.1.1.1.6.2 $"
+
+maxusers 32
+
+options MIPS32
+options NOFPU # No FPU
+options SOFTFLOAT # emulate FPU insn
+#options CONSPEED=115200 # YAMON default
+options HZ=512 # for profiling
+
+# Board selection
+options ALCHEMY_GENERIC
+
+# CPU support
+options ALCHEMY_AU1000
+options ALCHEMY_AU1100
+options ALCHEMY_AU1500
+options ALCHEMY_AU1550
+
+#options LOCKDEBUG
+options SOSEND_LOAN
+options SOSEND_COUNTERS
+options INET_CSUM_COUNTERS
+options TCP_CSUM_COUNTERS
+options UDP_CSUM_COUNTERS
+options TCP_OUTPUT_COUNTERS
+
+# Standard system options
+options KTRACE # system call tracing support
+options SYSVMSG # System V message queues
+options SYSVSEM # System V semaphores
+options SYSVSHM # System V shared memory
+#options SHMMAXPGS=1024 # 1024 pages is the default
+#options LKM # loadable kernel modules
+options NTP # network time protocol
+
+# Debugging options
+options DIAGNOSTIC # extra kernel sanity checking
+options DEBUG # extra kernel debugging support
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
+options DDB # kernel dynamic debugger
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+makeoptions DEBUG="-g" # compile full symbol table
+options SYMTAB_SPACE=180000 # size for embedded symbol table
+
+# Compatibility options
+#options COMPAT_43 # compatibility with 4.3BSD binaries
+#options COMPAT_09 # NetBSD 0.9 binary compatibility
+#options COMPAT_10 # NetBSD 1.0 binary compatibility
+#options COMPAT_11 # NetBSD 1.1 binary compatibility
+#options COMPAT_12 # NetBSD 1.2 binary compatibility
+#options COMPAT_13 # NetBSD 1.3 binary compatibility
+#options COMPAT_14 # NetBSD 1.4 binary compatibility
+options COMPAT_16 # NetBSD 1.6 binary compatibility
+options COMPAT_20 # NetBSD 2.0 binary compatibility
+options COMPAT_30 # NetBSD 3.0 compatibility.
+#options EXEC_ECOFF # exec ECOFF binaries
+#options COMPAT_ULTRIX # binary compatibility with Ultrix
+options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
+# File systems
+file-system FFS # Berkeley Fast Filesystem
+file-system MFS # memory-based filesystem
+#file-system EXT2FS # second extended file system (linux)
+file-system NFS # Sun NFS-compatible filesystem client
+#file-system KERNFS # kernel data-structure filesystem
+#file-system NULLFS # NULL layered filesystem
+#file-system OVERLAY # overlay file system
+file-system FDESC # user file descriptor filesystem
+#file-system UMAPFS # uid/gid remapping filesystem
+#file-system LFS # Log-based filesystem (still experimental)
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system UNION # union file system
+#file-system MSDOSFS # MS-DOS FAT filesystem(s).
+#file-system CODA # Coda File System; also needs vcoda (below)
+#file-system PTYFS # /dev/pts/N support
+
+# File system options
+#options NFSSERVER # Sun NFS-compatible filesystem server
+#options QUOTA # FFS quotas
+#options FFS_EI # FFS Endian Independant support
+#options SOFTDEP # FFS soft updates support.
+options FFS_NO_SNAPSHOT # ffs snapshots
+#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+ # immutable) behave as system flags.
+
+# Networking options
+#options GATEWAY # IP packet forwarding
+options INET # Internet protocols
+#options INET6 # IPV6
+#options IPSEC # IP security
+#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
+#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
+#options IPSEC_DEBUG # debug for IP security
+#options MROUTING # packet forwarding of multicast packets
+#options PIM # Protocol Independent Multicast
+#options NS # Xerox NS networking
+#options NSIP # Xerox NS tunneling over IP
+#options ISO,TPIP # OSI networking
+#options EON # OSI tunneling over IP
+#options CCITT,LLC,HDLC # X.25
+#options NETATALK # AppleTalk (over Ethernet) protocol
+#options PPP_BSDCOMP # BSD-Compress compression support for PPP
+#options PPP_DEFLATE # Deflate compression support for PPP
+#options PPP_FILTER # Active filter support for PPP (requires bpf)
+#options PFIL_HOOKS # pfil(9) packet filter hooks
+options IPFILTER_LOG # ipmon(8) log support
+
+# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
+#options TCP_COMPAT_42
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+options MIIVERBOSE # verbose PHY autoconfig messages
+options PCIVERBOSE # verbose PCI device autoconfig messages
+#options PCI_CONFIG_DUMP # verbosely dump PCI config space
+options SCSIVERBOSE # human readable SCSI error messages
+options USBVERBOSE # verbose USB device autoconfig messages
+
+options NFS_BOOT_DHCP
+
+# Pretty much only one device to use for the root file system.
+config netbsd root on ? type ?
+config netbsd-aumac0 root on aumac0 type nfs
+
+mainbus0 at root
+
+cpu0 at mainbus?
+
+aubus0 at mainbus?
+
+# no RTC! fake with one of the programmable clocks
+aurtc* at aubus? addr ?
+
+# UARTs
+aucom* at aubus? addr ?
+
+# Ethernet MACs
+aumac* at aubus? addr ?
+options AUMAC_EVENT_COUNTERS
+
+# MII/PHY support
+amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ? # Broadcom BCM5201/BCM5202 PHYs
+sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
+acphy* at mii? phy ? # AMD/Altima AC101 PHYs
+ukphy* at mii? phy ? # Catch-all PHYs
+
+# USB
+ohci* at aubus? addr ? # USB Open Host Controller
+
+# USB bus support
+usb* at ohci?
+
+# USB Hubs
+uhub* at usb?
+uhub* at uhub? port ? configuration ? interface ?
+
+# USB HID device
+uhidev* at uhub? port ? configuration ? interface ?
+
+# USB Mice
+ums* at uhidev? reportid ?
+wsmouse* at ums? mux 0
+
+# USB Keyboards
+ukbd* at uhidev? reportid ?
+wskbd* at ukbd? console ? mux 1
+
+# USB serial adpater
+ucycom* at uhidev? reportid ?
+
+# USB Generic HID devices
+uhid* at uhidev? reportid ?
+
+# USB Printer
+ulpt* at uhub? port ? configuration ? interface ?
+
+# USB Modem
+umodem* at uhub? port ? configuration ?
+ucom* at umodem?
+
+# USB Mass Storage
+umass* at uhub? port ? configuration ? interface ?
+scsibus* at scsi?
+sd* at scsibus? target ? lun ?
+
+# USB audio
+#uaudio* at uhub? port ? configuration ?
+
+# USB MIDI
+#umidi* at uhub? port ? configuration ?
+
+# USB IrDA
+# USB-IrDA bridge spec
+#uirda* at uhub? port ? configuration ? interface ?
+#irframe* at uirda?
+
+# Kyocera AIR-EDGE PHONE
+#ukyopon* at uhub? port ?
+#ucom* at ukyopon? portno ?
+
+# USB Ethernet
+axe* at uhub? port ? configuration ?
+aue* at uhub? port ? configuration ?
+
+# USB Generic driver
+ugen* at uhub? port ?
+
+# Audio support
+#auaudio* at aubus? addr ? # STAC9745 audio codec
+#audio* at auaudio?
+
+# On-board devices
+obio* at mainbus?
+
+#aupcmcia* at obio? addr ?
+#pcmcia* at aupcmcia?
+
+#pbpci* at obio? addr ?
+#pci* at pbpci?
+
+#flash* at obio? addr ?
+#lcd* at obio? addr ?
+
+#pchb* at pci? dev ? function ?
+#pcib* at pci? dev ? function ?
+
+# PCMCIA devices
+#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+
+# Pseudo-devices
+
+# Disk/mass storage pseudo-devices
+#pseudo-device ccd 4 # concatenated disk devices
+#pseudo-device raid 4 # RAIDframe disk driver
+#options RAID_AUTOCONFIG # auto-configuration of RAID
+#pseudo-device fss 4 # file system snapshot device
+#pseudo-device md 1 # memory disk device (ramdisk)
+pseudo-device vnd 4 # disk-like interface to files
+
+# Network pseudo-devices
+pseudo-device bpfilter 8 # Berkeley packet filter
+pseudo-device ipfilter # IP filter (firewall) and NAT
+pseudo-device loop # network loopback
+#pseudo-device ppp 2 # Point-to-Point Protocol
+#pseudo-device sl 2 # Serial Line IP
+#pseudo-device strip 2 # Starmode Radio IP (Metricom)
+#pseudo-device tun 2 # network tunneling over tty
+#pseudo-device tap # virtual Ethernet
+#pseudo-device gre 2 # generic L3 over IP tunnel
+#pseudo-device ipip 2 # RFC 2003 IP Encapsulation
+#pseudo-device gif 4 # RFC1933 tunnel
+#pseudo-device faith 1 # IPv[46] tcp relay translation
+#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
+pseudo-device vlan # IEEE 802.1q encapsulation
+pseudo-device bridge # simple inter-network bridging
+
+# Miscellaneous pseudo-devices
+pseudo-device pty # pseudo-terminals
+#pseudo-device tb 1 # tablet line discipline
+#pseudo-device sequencer 1 # MIDI sequencer
+# rnd works; RND_COM does not on port i386 yet.
+pseudo-device rnd # /dev/random & kernel generator
+#options RND_COM # use "com" randomness (BROKEN)
+
+# A pseudo device needed for Coda # also needs CODA (above)
+#pseudo-device vcoda 4 # coda minicache <-> venus comm.
Index: arch/evbmips/conf/CABERNET
===================================================================
RCS file: arch/evbmips/conf/CABERNET
diff -N arch/evbmips/conf/CABERNET
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/conf/CABERNET 16 Nov 2005 00:15:49 -0000
@@ -0,0 +1,272 @@
+# $NetBSD$
+#
+# Kernel config for DbAu1550 (Cabernet) AMD Alchemy evaluation board.
+
+include "arch/evbmips/conf/std.alchemy"
+
+#ident "CABERNET-$Revision: 1.1.1.1.6.2 $"
+
+maxusers 32
+
+options MIPS32
+options NOFPU # No FPU
+options SOFTFLOAT # emulate FPU insn
+options HZ=512 # for profiling
+
+# Board selection
+options ALCHEMY_CABERNET
+
+# CPU support
+options ALCHEMY_AU1550
+
+#options LOCKDEBUG
+options SOSEND_LOAN
+options SOSEND_COUNTERS
+options INET_CSUM_COUNTERS
+options TCP_CSUM_COUNTERS
+options UDP_CSUM_COUNTERS
+options TCP_OUTPUT_COUNTERS
+
+# Standard system options
+options KTRACE # system call tracing support
+options SYSVMSG # System V message queues
+options SYSVSEM # System V semaphores
+options SYSVSHM # System V shared memory
+#options SHMMAXPGS=1024 # 1024 pages is the default
+#options LKM # loadable kernel modules
+options NTP # network time protocol
+
+# Debugging options
+options DIAGNOSTIC # extra kernel sanity checking
+options DEBUG # extra kernel debugging support
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
+options DDB # kernel dynamic debugger
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+makeoptions DEBUG="-g" # compile full symbol table
+options SYMTAB_SPACE=180000 # size for embedded symbol table
+
+# Compatibility options
+#options COMPAT_43 # compatibility with 4.3BSD binaries
+#options COMPAT_09 # NetBSD 0.9 binary compatibility
+#options COMPAT_10 # NetBSD 1.0 binary compatibility
+#options COMPAT_11 # NetBSD 1.1 binary compatibility
+#options COMPAT_12 # NetBSD 1.2 binary compatibility
+#options COMPAT_13 # NetBSD 1.3 binary compatibility
+#options COMPAT_14 # NetBSD 1.4 binary compatibility
+options COMPAT_16 # NetBSD 1.6 binary compatibility
+options COMPAT_20 # NetBSD 2.0 binary compatibility
+options COMPAT_30 # NetBSD 3.0 compatibility.
+#options EXEC_ECOFF # exec ECOFF binaries
+#options COMPAT_ULTRIX # binary compatibility with Ultrix
+options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
+# File systems
+file-system FFS # Berkeley Fast Filesystem
+file-system MFS # memory-based filesystem
+#file-system EXT2FS # second extended file system (linux)
+file-system NFS # Sun NFS-compatible filesystem client
+#file-system KERNFS # kernel data-structure filesystem
+#file-system NULLFS # NULL layered filesystem
+#file-system OVERLAY # overlay file system
+file-system FDESC # user file descriptor filesystem
+#file-system UMAPFS # uid/gid remapping filesystem
+#file-system LFS # Log-based filesystem (still experimental)
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system UNION # union file system
+#file-system MSDOSFS # MS-DOS FAT filesystem(s).
+#file-system CODA # Coda File System; also needs vcoda (below)
+#file-system PTYFS # /dev/pts/N support
+
+# File system options
+#options NFSSERVER # Sun NFS-compatible filesystem server
+#options QUOTA # FFS quotas
+#options FFS_EI # FFS Endian Independant support
+#options SOFTDEP # FFS soft updates support.
+options FFS_NO_SNAPSHOT # ffs snapshots
+#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+ # immutable) behave as system flags.
+
+# Networking options
+#options GATEWAY # IP packet forwarding
+options INET # Internet protocols
+#options INET6 # IPV6
+#options IPSEC # IP security
+#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
+#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
+#options IPSEC_DEBUG # debug for IP security
+#options MROUTING # packet forwarding of multicast packets
+#options PIM # Protocol Independent Multicast
+#options NS # Xerox NS networking
+#options NSIP # Xerox NS tunneling over IP
+#options ISO,TPIP # OSI networking
+#options EON # OSI tunneling over IP
+#options CCITT,LLC,HDLC # X.25
+#options NETATALK # AppleTalk (over Ethernet) protocol
+#options PPP_BSDCOMP # BSD-Compress compression support for PPP
+#options PPP_DEFLATE # Deflate compression support for PPP
+#options PPP_FILTER # Active filter support for PPP (requires bpf)
+#options PFIL_HOOKS # pfil(9) packet filter hooks
+options IPFILTER_LOG # ipmon(8) log support
+
+# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
+#options TCP_COMPAT_42
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+options MIIVERBOSE # verbose PHY autoconfig messages
+options PCIVERBOSE # verbose PCI device autoconfig messages
+#options PCI_CONFIG_DUMP # verbosely dump PCI config space
+options SCSIVERBOSE # human readable SCSI error messages
+options USBVERBOSE # verbose USB device autoconfig messages
+
+options NFS_BOOT_DHCP
+
+# Pretty much only one device to use for the root file system.
+config netbsd root on ? type ?
+config netbsd-aumac0 root on aumac0 type nfs
+
+mainbus0 at root
+
+cpu0 at mainbus?
+
+aubus0 at mainbus?
+
+# no RTC! fake with one of the programmable clocks
+aurtc* at aubus? addr ?
+
+# UARTs
+aucom* at aubus? addr ?
+
+# Ethernet MACs
+aumac* at aubus? addr ?
+options AUMAC_EVENT_COUNTERS
+
+# MII/PHY support
+amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ? # Broadcom BCM5201/BCM5202 PHYs
+sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
+acphy* at mii? phy ? # AMD/Altima AC101 PHYs
+ukphy* at mii? phy ? # Catch-all PHYs
+
+# USB
+ohci* at aubus? addr ? # USB Open Host Controller
+
+# USB bus support
+usb* at ohci?
+
+# USB Hubs
+uhub* at usb?
+uhub* at uhub? port ? configuration ? interface ?
+
+# USB HID device
+uhidev* at uhub? port ? configuration ? interface ?
+
+# USB Mice
+ums* at uhidev? reportid ?
+wsmouse* at ums? mux 0
+
+# USB Keyboards
+ukbd* at uhidev? reportid ?
+wskbd* at ukbd? console ? mux 1
+
+# USB serial adpater
+ucycom* at uhidev? reportid ?
+
+# USB Generic HID devices
+uhid* at uhidev? reportid ?
+
+# USB Printer
+ulpt* at uhub? port ? configuration ? interface ?
+
+# USB Modem
+umodem* at uhub? port ? configuration ?
+ucom* at umodem?
+
+# USB Mass Storage
+umass* at uhub? port ? configuration ? interface ?
+scsibus* at scsi?
+sd* at scsibus? target ? lun ?
+
+# USB audio
+#uaudio* at uhub? port ? configuration ?
+
+# USB MIDI
+#umidi* at uhub? port ? configuration ?
+
+# USB IrDA
+# USB-IrDA bridge spec
+#uirda* at uhub? port ? configuration ? interface ?
+#irframe* at uirda?
+
+# Kyocera AIR-EDGE PHONE
+#ukyopon* at uhub? port ?
+#ucom* at ukyopon? portno ?
+
+# USB Ethernet
+axe* at uhub? port ? configuration ?
+aue* at uhub? port ? configuration ?
+
+# USB Generic driver
+ugen* at uhub? port ?
+
+# Audio support
+#auaudio* at aubus? addr ? # STAC9745 audio codec
+#audio* at auaudio?
+
+# On-board devices
+obio* at mainbus?
+
+#aupcmcia* at obio? addr ?
+#pcmcia* at aupcmcia?
+
+#pbpci* at obio? addr ?
+#pci* at pbpci?
+
+#flash* at obio? addr ?
+#lcd* at obio? addr ?
+
+#pchb* at pci? dev ? function ?
+#pcib* at pci? dev ? function ?
+
+# PCMCIA devices
+#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+
+# Pseudo-devices
+
+# Disk/mass storage pseudo-devices
+#pseudo-device ccd 4 # concatenated disk devices
+#pseudo-device raid 4 # RAIDframe disk driver
+#options RAID_AUTOCONFIG # auto-configuration of RAID
+#pseudo-device fss 4 # file system snapshot device
+#pseudo-device md 1 # memory disk device (ramdisk)
+pseudo-device vnd 4 # disk-like interface to files
+
+# Network pseudo-devices
+pseudo-device bpfilter 8 # Berkeley packet filter
+pseudo-device ipfilter # IP filter (firewall) and NAT
+pseudo-device loop # network loopback
+#pseudo-device ppp 2 # Point-to-Point Protocol
+#pseudo-device sl 2 # Serial Line IP
+#pseudo-device strip 2 # Starmode Radio IP (Metricom)
+#pseudo-device tun 2 # network tunneling over tty
+#pseudo-device tap # virtual Ethernet
+#pseudo-device gre 2 # generic L3 over IP tunnel
+#pseudo-device ipip 2 # RFC 2003 IP Encapsulation
+#pseudo-device gif 4 # RFC1933 tunnel
+#pseudo-device faith 1 # IPv[46] tcp relay translation
+#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
+pseudo-device vlan # IEEE 802.1q encapsulation
+pseudo-device bridge # simple inter-network bridging
+
+# Miscellaneous pseudo-devices
+pseudo-device pty # pseudo-terminals
+#pseudo-device tb 1 # tablet line discipline
+#pseudo-device sequencer 1 # MIDI sequencer
+# rnd works; RND_COM does not on port i386 yet.
+pseudo-device rnd # /dev/random & kernel generator
+#options RND_COM # use "com" randomness (BROKEN)
+
+# A pseudo device needed for Coda # also needs CODA (above)
+#pseudo-device vcoda 4 # coda minicache <-> venus comm.
Index: arch/evbmips/conf/PB1000
===================================================================
RCS file: arch/evbmips/conf/PB1000
diff -N arch/evbmips/conf/PB1000
--- arch/evbmips/conf/PB1000 11 Nov 2005 01:16:12 -0000 1.1.1.1.6.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,267 +0,0 @@
-# $NetBSD: PB1000,v 1.25 2005/08/19 05:19:50 christos Exp $
-#
-# Kernel config for the AMD Alchemy PB1XXX and DB1XXX evaluation boards.
-
-include "arch/evbmips/conf/std.pb1000"
-
-#ident "PB1000-$Revision: 1.1.1.1.6.2 $"
-
-maxusers 32
-
-options MIPS32
-options NOFPU # No FPU
-options SOFTFLOAT # emulate FPU insn
-options CONSPEED=115200 # YAMON default
-options HZ=512 # for profiling
-
-options ALCHEMY_AU1000
-options ALCHEMY_AU1100
-options ALCHEMY_AU1500
-options ALCHEMY_AU1550
-
-#options LOCKDEBUG
-options SOSEND_LOAN
-options SOSEND_COUNTERS
-options INET_CSUM_COUNTERS
-options TCP_CSUM_COUNTERS
-options UDP_CSUM_COUNTERS
-options TCP_OUTPUT_COUNTERS
-
-# Standard system options
-options KTRACE # system call tracing support
-options SYSVMSG # System V message queues
-options SYSVSEM # System V semaphores
-options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-#options LKM # loadable kernel modules
-options NTP # network time protocol
-
-# Debugging options
-options DIAGNOSTIC # extra kernel sanity checking
-options DEBUG # extra kernel debugging support
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
-options DDB # kernel dynamic debugger
-options DDB_HISTORY_SIZE=100 # enable history editing in DDB
-makeoptions DEBUG="-g" # compile full symbol table
-options SYMTAB_SPACE=180000 # size for embedded symbol table
-
-# Compatibility options
-#options COMPAT_43 # compatibility with 4.3BSD binaries
-#options COMPAT_09 # NetBSD 0.9 binary compatibility
-#options COMPAT_10 # NetBSD 1.0 binary compatibility
-#options COMPAT_11 # NetBSD 1.1 binary compatibility
-#options COMPAT_12 # NetBSD 1.2 binary compatibility
-#options COMPAT_13 # NetBSD 1.3 binary compatibility
-#options COMPAT_14 # NetBSD 1.4 binary compatibility
-options COMPAT_16 # NetBSD 1.6 binary compatibility
-options COMPAT_20 # NetBSD 2.0 binary compatibility
-options COMPAT_30 # NetBSD 3.0 compatibility.
-#options EXEC_ECOFF # exec ECOFF binaries
-#options COMPAT_ULTRIX # binary compatibility with Ultrix
-options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
-
-# File systems
-file-system FFS # Berkeley Fast Filesystem
-file-system MFS # memory-based filesystem
-#file-system EXT2FS # second extended file system (linux)
-file-system NFS # Sun NFS-compatible filesystem client
-#file-system KERNFS # kernel data-structure filesystem
-#file-system NULLFS # NULL layered filesystem
-#file-system OVERLAY # overlay file system
-file-system FDESC # user file descriptor filesystem
-#file-system UMAPFS # uid/gid remapping filesystem
-#file-system LFS # Log-based filesystem (still experimental)
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system UNION # union file system
-#file-system MSDOSFS # MS-DOS FAT filesystem(s).
-#file-system CODA # Coda File System; also needs vcoda (below)
-#file-system PTYFS # /dev/pts/N support
-
-# File system options
-#options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # FFS quotas
-#options FFS_EI # FFS Endian Independant support
-#options SOFTDEP # FFS soft updates support.
-options FFS_NO_SNAPSHOT # ffs snapshots
-#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
- # immutable) behave as system flags.
-
-# Networking options
-#options GATEWAY # IP packet forwarding
-options INET # Internet protocols
-#options INET6 # IPV6
-#options IPSEC # IP security
-#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
-#options IPSEC_DEBUG # debug for IP security
-#options MROUTING # packet forwarding of multicast packets
-#options PIM # Protocol Independent Multicast
-#options NS # Xerox NS networking
-#options NSIP # Xerox NS tunneling over IP
-#options ISO,TPIP # OSI networking
-#options EON # OSI tunneling over IP
-#options CCITT,LLC,HDLC # X.25
-#options NETATALK # AppleTalk (over Ethernet) protocol
-#options PPP_BSDCOMP # BSD-Compress compression support for PPP
-#options PPP_DEFLATE # Deflate compression support for PPP
-#options PPP_FILTER # Active filter support for PPP (requires bpf)
-#options PFIL_HOOKS # pfil(9) packet filter hooks
-options IPFILTER_LOG # ipmon(8) log support
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
-
-# These options enable verbose messages for several subsystems.
-# Warning, these may compile large string tables into the kernel!
-options MIIVERBOSE # verbose PHY autoconfig messages
-options PCIVERBOSE # verbose PCI device autoconfig messages
-#options PCI_CONFIG_DUMP # verbosely dump PCI config space
-options SCSIVERBOSE # human readable SCSI error messages
-options USBVERBOSE # verbose USB device autoconfig messages
-
-options NFS_BOOT_DHCP
-
-# Pretty much only one device to use for the root file system.
-config netbsd root on ? type ?
-config netbsd-aumac0 root on aumac0 type nfs
-
-mainbus0 at root
-
-cpu0 at mainbus?
-
-aubus0 at mainbus?
-
-# no RTC! fake with one of the programmable clocks
-aurtc* at aubus? addr ?
-
-# UARTs
-aucom* at aubus? addr ?
-
-# Ethernet MACs
-aumac* at aubus? addr ?
-options AUMAC_EVENT_COUNTERS
-
-# MII/PHY support
-amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
-bmtphy* at mii? phy ? # Broadcom BCM5201/BCM5202 PHYs
-sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
-acphy* at mii? phy ? # AMD/Altima AC101 PHYs
-
-# USB
-ohci* at aubus? addr ? # USB Open Host Controller
-
-# USB bus support
-usb* at ohci?
-
-# USB Hubs
-uhub* at usb?
-uhub* at uhub? port ? configuration ? interface ?
-
-# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
-
-# USB Mice
-ums* at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB Keyboards
-ukbd* at uhidev? reportid ?
-wskbd* at ukbd? console ? mux 1
-
-# USB serial adpater
-ucycom* at uhidev? reportid ?
-
-# USB Generic HID devices
-uhid* at uhidev? reportid ?
-
-# USB Printer
-ulpt* at uhub? port ? configuration ? interface ?
-
-# USB Modem
-umodem* at uhub? port ? configuration ?
-ucom* at umodem?
-
-# USB Mass Storage
-umass* at uhub? port ? configuration ? interface ?
-scsibus* at scsi?
-sd* at scsibus? target ? lun ?
-
-# USB audio
-#uaudio* at uhub? port ? configuration ?
-
-# USB MIDI
-#umidi* at uhub? port ? configuration ?
-
-# USB IrDA
-# USB-IrDA bridge spec
-#uirda* at uhub? port ? configuration ? interface ?
-#irframe* at uirda?
-
-# Kyocera AIR-EDGE PHONE
-#ukyopon* at uhub? port ?
-#ucom* at ukyopon? portno ?
-
-# USB Generic driver
-ugen* at uhub? port ?
-
-# Audio support
-auaudio* at aubus? addr ? # STAC9745 audio codec
-audio* at auaudio?
-
-# On-board devices
-obio* at mainbus?
-
-aupcmcia* at obio? addr ?
-pcmcia* at aupcmcia?
-
-#pbpci* at obio? addr ?
-#pci* at pbpci?
-
-#flash* at obio? addr ?
-#lcd* at obio? addr ?
-
-#pchb* at pci? dev ? function ?
-#pcib* at pci? dev ? function ?
-
-# PCMCIA devices
-wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
-
-# Pseudo-devices
-
-# Disk/mass storage pseudo-devices
-#pseudo-device ccd 4 # concatenated disk devices
-#pseudo-device raid 4 # RAIDframe disk driver
-#options RAID_AUTOCONFIG # auto-configuration of RAID
-#pseudo-device fss 4 # file system snapshot device
-#pseudo-device md 1 # memory disk device (ramdisk)
-pseudo-device vnd 4 # disk-like interface to files
-
-# Network pseudo-devices
-pseudo-device bpfilter 8 # Berkeley packet filter
-pseudo-device ipfilter # IP filter (firewall) and NAT
-pseudo-device loop # network loopback
-#pseudo-device ppp 2 # Point-to-Point Protocol
-#pseudo-device sl 2 # Serial Line IP
-#pseudo-device strip 2 # Starmode Radio IP (Metricom)
-#pseudo-device tun 2 # network tunneling over tty
-#pseudo-device tap # virtual Ethernet
-#pseudo-device gre 2 # generic L3 over IP tunnel
-#pseudo-device ipip 2 # RFC 2003 IP Encapsulation
-#pseudo-device gif 4 # RFC1933 tunnel
-#pseudo-device faith 1 # IPv[46] tcp relay translation
-#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
-pseudo-device vlan # IEEE 802.1q encapsulation
-pseudo-device bridge # simple inter-network bridging
-
-# Miscellaneous pseudo-devices
-pseudo-device pty # pseudo-terminals
-#pseudo-device tb 1 # tablet line discipline
-#pseudo-device sequencer 1 # MIDI sequencer
-# rnd works; RND_COM does not on port i386 yet.
-pseudo-device rnd # /dev/random & kernel generator
-#options RND_COM # use "com" randomness (BROKEN)
-
-# A pseudo device needed for Coda # also needs CODA (above)
-#pseudo-device vcoda 4 # coda minicache <-> venus comm.
Index: arch/evbmips/conf/ZINFANDEL
===================================================================
RCS file: arch/evbmips/conf/ZINFANDEL
diff -N arch/evbmips/conf/ZINFANDEL
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/conf/ZINFANDEL 16 Nov 2005 00:15:50 -0000
@@ -0,0 +1,272 @@
+# $NetBSD$
+#
+# Kernel config for DbAu1500 (Zinfandel) AMD Alchemy evaluation board.
+
+include "arch/evbmips/conf/std.alchemy"
+
+#ident "ZINFANDEL-$Revision: 1.1.1.1.6.2 $"
+
+maxusers 32
+
+options MIPS32
+options NOFPU # No FPU
+options SOFTFLOAT # emulate FPU insn
+options HZ=512 # for profiling
+
+# Board selection
+options ALCHEMY_ZINFANDEL
+
+# CPU support
+options ALCHEMY_AU1500
+
+#options LOCKDEBUG
+options SOSEND_LOAN
+options SOSEND_COUNTERS
+options INET_CSUM_COUNTERS
+options TCP_CSUM_COUNTERS
+options UDP_CSUM_COUNTERS
+options TCP_OUTPUT_COUNTERS
+
+# Standard system options
+options KTRACE # system call tracing support
+options SYSVMSG # System V message queues
+options SYSVSEM # System V semaphores
+options SYSVSHM # System V shared memory
+#options SHMMAXPGS=1024 # 1024 pages is the default
+#options LKM # loadable kernel modules
+options NTP # network time protocol
+
+# Debugging options
+options DIAGNOSTIC # extra kernel sanity checking
+options DEBUG # extra kernel debugging support
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
+options DDB # kernel dynamic debugger
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+makeoptions DEBUG="-g" # compile full symbol table
+options SYMTAB_SPACE=180000 # size for embedded symbol table
+
+# Compatibility options
+#options COMPAT_43 # compatibility with 4.3BSD binaries
+#options COMPAT_09 # NetBSD 0.9 binary compatibility
+#options COMPAT_10 # NetBSD 1.0 binary compatibility
+#options COMPAT_11 # NetBSD 1.1 binary compatibility
+#options COMPAT_12 # NetBSD 1.2 binary compatibility
+#options COMPAT_13 # NetBSD 1.3 binary compatibility
+#options COMPAT_14 # NetBSD 1.4 binary compatibility
+options COMPAT_16 # NetBSD 1.6 binary compatibility
+options COMPAT_20 # NetBSD 2.0 binary compatibility
+options COMPAT_30 # NetBSD 3.0 compatibility.
+#options EXEC_ECOFF # exec ECOFF binaries
+#options COMPAT_ULTRIX # binary compatibility with Ultrix
+options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
+# File systems
+file-system FFS # Berkeley Fast Filesystem
+file-system MFS # memory-based filesystem
+#file-system EXT2FS # second extended file system (linux)
+file-system NFS # Sun NFS-compatible filesystem client
+#file-system KERNFS # kernel data-structure filesystem
+#file-system NULLFS # NULL layered filesystem
+#file-system OVERLAY # overlay file system
+file-system FDESC # user file descriptor filesystem
+#file-system UMAPFS # uid/gid remapping filesystem
+#file-system LFS # Log-based filesystem (still experimental)
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system UNION # union file system
+#file-system MSDOSFS # MS-DOS FAT filesystem(s).
+#file-system CODA # Coda File System; also needs vcoda (below)
+#file-system PTYFS # /dev/pts/N support
+
+# File system options
+#options NFSSERVER # Sun NFS-compatible filesystem server
+#options QUOTA # FFS quotas
+#options FFS_EI # FFS Endian Independant support
+#options SOFTDEP # FFS soft updates support.
+options FFS_NO_SNAPSHOT # ffs snapshots
+#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+ # immutable) behave as system flags.
+
+# Networking options
+#options GATEWAY # IP packet forwarding
+options INET # Internet protocols
+#options INET6 # IPV6
+#options IPSEC # IP security
+#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
+#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
+#options IPSEC_DEBUG # debug for IP security
+#options MROUTING # packet forwarding of multicast packets
+#options PIM # Protocol Independent Multicast
+#options NS # Xerox NS networking
+#options NSIP # Xerox NS tunneling over IP
+#options ISO,TPIP # OSI networking
+#options EON # OSI tunneling over IP
+#options CCITT,LLC,HDLC # X.25
+#options NETATALK # AppleTalk (over Ethernet) protocol
+#options PPP_BSDCOMP # BSD-Compress compression support for PPP
+#options PPP_DEFLATE # Deflate compression support for PPP
+#options PPP_FILTER # Active filter support for PPP (requires bpf)
+#options PFIL_HOOKS # pfil(9) packet filter hooks
+options IPFILTER_LOG # ipmon(8) log support
+
+# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
+#options TCP_COMPAT_42
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+options MIIVERBOSE # verbose PHY autoconfig messages
+options PCIVERBOSE # verbose PCI device autoconfig messages
+#options PCI_CONFIG_DUMP # verbosely dump PCI config space
+options SCSIVERBOSE # human readable SCSI error messages
+options USBVERBOSE # verbose USB device autoconfig messages
+
+options NFS_BOOT_DHCP
+
+# Pretty much only one device to use for the root file system.
+config netbsd root on ? type ?
+config netbsd-aumac0 root on aumac0 type nfs
+
+mainbus0 at root
+
+cpu0 at mainbus?
+
+aubus0 at mainbus?
+
+# no RTC! fake with one of the programmable clocks
+aurtc* at aubus? addr ?
+
+# UARTs
+aucom* at aubus? addr ?
+
+# Ethernet MACs
+aumac* at aubus? addr ?
+options AUMAC_EVENT_COUNTERS
+
+# MII/PHY support
+amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ? # Broadcom BCM5201/BCM5202 PHYs
+sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
+acphy* at mii? phy ? # AMD/Altima AC101 PHYs
+ukphy* at mii? phy ? # Catch-all PHYs
+
+# USB
+ohci* at aubus? addr ? # USB Open Host Controller
+
+# USB bus support
+usb* at ohci?
+
+# USB Hubs
+uhub* at usb?
+uhub* at uhub? port ? configuration ? interface ?
+
+# USB HID device
+uhidev* at uhub? port ? configuration ? interface ?
+
+# USB Mice
+ums* at uhidev? reportid ?
+wsmouse* at ums? mux 0
+
+# USB Keyboards
+ukbd* at uhidev? reportid ?
+wskbd* at ukbd? console ? mux 1
+
+# USB serial adpater
+ucycom* at uhidev? reportid ?
+
+# USB Generic HID devices
+uhid* at uhidev? reportid ?
+
+# USB Printer
+ulpt* at uhub? port ? configuration ? interface ?
+
+# USB Modem
+umodem* at uhub? port ? configuration ?
+ucom* at umodem?
+
+# USB Mass Storage
+umass* at uhub? port ? configuration ? interface ?
+scsibus* at scsi?
+sd* at scsibus? target ? lun ?
+
+# USB audio
+#uaudio* at uhub? port ? configuration ?
+
+# USB MIDI
+#umidi* at uhub? port ? configuration ?
+
+# USB IrDA
+# USB-IrDA bridge spec
+#uirda* at uhub? port ? configuration ? interface ?
+#irframe* at uirda?
+
+# Kyocera AIR-EDGE PHONE
+#ukyopon* at uhub? port ?
+#ucom* at ukyopon? portno ?
+
+# USB Ethernet
+axe* at uhub? port ? configuration ?
+aue* at uhub? port ? configuration ?
+
+# USB Generic driver
+ugen* at uhub? port ?
+
+# Audio support
+#auaudio* at aubus? addr ? # STAC9745 audio codec
+#audio* at auaudio?
+
+# On-board devices
+obio* at mainbus?
+
+#aupcmcia* at obio? addr ?
+#pcmcia* at aupcmcia?
+
+#pbpci* at obio? addr ?
+#pci* at pbpci?
+
+#flash* at obio? addr ?
+#lcd* at obio? addr ?
+
+#pchb* at pci? dev ? function ?
+#pcib* at pci? dev ? function ?
+
+# PCMCIA devices
+#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+
+# Pseudo-devices
+
+# Disk/mass storage pseudo-devices
+#pseudo-device ccd 4 # concatenated disk devices
+#pseudo-device raid 4 # RAIDframe disk driver
+#options RAID_AUTOCONFIG # auto-configuration of RAID
+#pseudo-device fss 4 # file system snapshot device
+#pseudo-device md 1 # memory disk device (ramdisk)
+pseudo-device vnd 4 # disk-like interface to files
+
+# Network pseudo-devices
+pseudo-device bpfilter 8 # Berkeley packet filter
+pseudo-device ipfilter # IP filter (firewall) and NAT
+pseudo-device loop # network loopback
+#pseudo-device ppp 2 # Point-to-Point Protocol
+#pseudo-device sl 2 # Serial Line IP
+#pseudo-device strip 2 # Starmode Radio IP (Metricom)
+#pseudo-device tun 2 # network tunneling over tty
+#pseudo-device tap # virtual Ethernet
+#pseudo-device gre 2 # generic L3 over IP tunnel
+#pseudo-device ipip 2 # RFC 2003 IP Encapsulation
+#pseudo-device gif 4 # RFC1933 tunnel
+#pseudo-device faith 1 # IPv[46] tcp relay translation
+#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
+pseudo-device vlan # IEEE 802.1q encapsulation
+pseudo-device bridge # simple inter-network bridging
+
+# Miscellaneous pseudo-devices
+pseudo-device pty # pseudo-terminals
+#pseudo-device tb 1 # tablet line discipline
+#pseudo-device sequencer 1 # MIDI sequencer
+# rnd works; RND_COM does not on port i386 yet.
+pseudo-device rnd # /dev/random & kernel generator
+#options RND_COM # use "com" randomness (BROKEN)
+
+# A pseudo device needed for Coda # also needs CODA (above)
+#pseudo-device vcoda 4 # coda minicache <-> venus comm.
Index: arch/evbmips/conf/files.alchemy
===================================================================
RCS file: arch/evbmips/conf/files.alchemy
diff -N arch/evbmips/conf/files.alchemy
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/conf/files.alchemy 16 Nov 2005 00:15:50 -0000
@@ -0,0 +1,61 @@
+# $NetBSD$
+
+# Platform support - select just one, please
+defflag opt_alchemy.h ALCHEMY_GENERIC
+ ALCHEMY_CABERNET
+ ALCHEMY_ZINFANDEL
+
+file arch/evbmips/alchemy/mach_intr.c
+
+file arch/evbmips/alchemy/autoconf.c
+file arch/evbmips/alchemy/machdep.c
+
+file arch/evbmips/alchemy/board_generic.c alchemy_generic
+file arch/evbmips/alchemy/board_cabernet.c alchemy_cabernet
+file arch/evbmips/alchemy/board_zinfandel.c alchemy_zinfandel
+
+file arch/mips/mips/bus_dma.c
+file arch/evbmips/evbmips/clock.c
+file arch/evbmips/evbmips/disksubr.c
+file arch/evbmips/evbmips/interrupt.c
+file arch/evbmips/evbmips/yamon.c
+
+file arch/mips/mips/softintr.c
+
+# System bus
+device mainbus { }
+attach mainbus at root
+file arch/evbmips/alchemy/mainbus.c mainbus
+
+device cpu
+attach cpu at mainbus
+file arch/evbmips/alchemy/cpu.c cpu
+
+# Alchemy on-board devices
+device obio { [addr=-1] }
+attach obio at mainbus
+file arch/evbmips/alchemy/obio.c obio
+
+device aupcmcia: pcmciabus
+attach aupcmcia at obio
+file arch/evbmips/alchemy/dev/aupcmcia.c aupcmcia
+
+# Machine-independent SCSI drivers
+include "dev/scsipi/files.scsipi"
+
+# Machine-independent ATA drivers
+include "dev/ata/files.ata"
+
+# Machine-independent WS console drivers
+include "dev/wsfont/files.wsfont"
+include "dev/wscons/files.wscons"
+
+# Machine-independent USB device support
+include "dev/usb/files.usb"
+
+# Machine-independent PCMCIA drivers
+device fdc {drive = -1} # files.pcmcia requires.
+include "dev/pcmcia/files.pcmcia"
+
+# Memory Disk
+file dev/md_root.c memory_disk_hooks
Index: arch/evbmips/conf/files.pb1000
===================================================================
RCS file: arch/evbmips/conf/files.pb1000
diff -N arch/evbmips/conf/files.pb1000
--- arch/evbmips/conf/files.pb1000 9 Nov 2005 14:17:15 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-# $NetBSD: files.pb1000,v 1.8 2003/10/25 22:34:57 simonb Exp $
-
-file arch/evbmips/alchemy/pb1000_intr.c
-
-file arch/evbmips/alchemy/autoconf.c
-file arch/evbmips/alchemy/machdep.c
-
-file arch/mips/mips/bus_dma.c
-file arch/evbmips/evbmips/clock.c
-file arch/evbmips/evbmips/disksubr.c
-file arch/evbmips/evbmips/interrupt.c
-file arch/evbmips/evbmips/yamon.c
-
-file arch/mips/mips/softintr.c
-
-# System bus
-device mainbus { }
-attach mainbus at root
-file arch/evbmips/alchemy/mainbus.c mainbus
-
-device cpu
-attach cpu at mainbus
-file arch/evbmips/alchemy/cpu.c cpu
-
-# Pb1000 on-board devices
-device obio { [addr=-1] }
-attach obio at mainbus
-file arch/evbmips/alchemy/pb1000_obio.c obio
-#file arch/evbmips/alchemy/pb1000_obio_space.c obio
-
-device aupcmcia: pcmciabus
-attach aupcmcia at obio
-file arch/evbmips/alchemy/dev/aupcmcia.c aupcmcia
-
-# Machine-independent SCSI drivers
-include "dev/scsipi/files.scsipi"
-
-# Machine-independent ATA drivers
-include "dev/ata/files.ata"
-
-# Machine-independent WS console drivers
-include "dev/wsfont/files.wsfont"
-include "dev/wscons/files.wscons"
-
-# Machine-independent USB device support
-include "dev/usb/files.usb"
-
-# Machine-independent PCMCIA drivers
-device fdc {drive = -1} # files.pcmcia requires.
-include "dev/pcmcia/files.pcmcia"
-
-# Memory Disk
-file dev/md_root.c memory_disk_hooks
Index: arch/evbmips/conf/std.alchemy
===================================================================
RCS file: arch/evbmips/conf/std.alchemy
diff -N arch/evbmips/conf/std.alchemy
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ arch/evbmips/conf/std.alchemy 16 Nov 2005 00:15:50 -0000
@@ -0,0 +1,15 @@
+# $NetBSD: std.pb1000,v 1.2 2005/09/17 09:44:06 yamt Exp $
+
+machine evbmips mips
+include "conf/std" # MI standard options
+
+options MIPS3_ENABLE_CLOCK_INTR
+
+options EXEC_ELF32 # exec ELF32 binaries
+options EXEC_SCRIPT # exec #! scripts
+
+makeoptions DEFTEXTADDR="0x800a0000"
+makeoptions BOARDTYPE="alchemy"
+
+include "arch/evbmips/conf/files.alchemy"
+include "arch/mips/conf/files.alchemy"
Index: arch/evbmips/conf/std.pb1000
===================================================================
RCS file: arch/evbmips/conf/std.pb1000
diff -N arch/evbmips/conf/std.pb1000
--- arch/evbmips/conf/std.pb1000 9 Nov 2005 14:17:15 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-# $NetBSD: std.pb1000,v 1.2 2005/09/17 09:44:06 yamt Exp $
-
-machine evbmips mips
-include "conf/std" # MI standard options
-
-options MIPS3_ENABLE_CLOCK_INTR
-
-# Platform support
-options ALCHEMY_PB1000
-
-options EXEC_ELF32 # exec ELF32 binaries
-options EXEC_SCRIPT # exec #! scripts
-
-makeoptions DEFTEXTADDR="0x800a0000"
-makeoptions BOARDTYPE="pb1000"
-
-include "arch/evbmips/conf/files.pb1000"
-include "arch/mips/conf/files.alchemy"
Index: arch/mips/alchemy/dev/ohci_aubus.c
===================================================================
RCS file: /net/projects/meteor/cvs/netbsd/src/sys/arch/mips/alchemy/dev/ohci_aubus.c,v
retrieving revision 1.1.1.1.6.1
diff -u -r1.1.1.1.6.1 ohci_aubus.c
--- arch/mips/alchemy/dev/ohci_aubus.c 10 Nov 2005 08:39:47 -0000 1.1.1.1.6.1
+++ arch/mips/alchemy/dev/ohci_aubus.c 16 Nov 2005 00:15:54 -0000
@@ -49,9 +49,6 @@
#include <mips/alchemy/include/auvar.h>
#include <mips/alchemy/include/aubusvar.h>
-#include <evbmips/alchemy/pb1000reg.h>
-#include <evbmips/alchemy/pb1000_obiovar.h>
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
--------------070905000905050304020006--