From c8934e81113bae8c46b3f8c6f410ac027365295a Mon Sep 17 00:00:00 2001
From: gdamore <gdamore@NetBSD.org>
Date: Thu, 23 Feb 2006 03:34:35 +0000
Subject: [PATCH] Remove evbmips-specific aupcmcia... to be reimported shortly
 into mips/alchemy.

---
 sys/arch/evbmips/alchemy/dev/aupcmcia.c | 71 -------------------------
 sys/arch/evbmips/conf/ALCHEMY           | 11 ++--
 sys/arch/evbmips/conf/files.alchemy     |  6 +--
 3 files changed, 4 insertions(+), 84 deletions(-)
 delete mode 100644 sys/arch/evbmips/alchemy/dev/aupcmcia.c

diff --git a/sys/arch/evbmips/alchemy/dev/aupcmcia.c b/sys/arch/evbmips/alchemy/dev/aupcmcia.c
deleted file mode 100644
index 05f615be875c..000000000000
--- a/sys/arch/evbmips/alchemy/dev/aupcmcia.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $NetBSD: aupcmcia.c,v 1.7 2005/12/11 12:17:11 christos 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: aupcmcia.c,v 1.7 2005/12/11 12:17:11 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-
-#include <mips/alchemy/include/aureg.h>
-#include <mips/alchemy/include/aubusvar.h>
-
-static int	aupcmcia_match(struct device *, struct cfdata *, void *);
-static void	aupcmcia_attach(struct device *, struct device *, void *);
-
-CFATTACH_DECL(aupcmcia, sizeof (struct device),
-    aupcmcia_match, aupcmcia_attach, NULL, NULL);
-
-int
-aupcmcia_match(struct device *parent, struct cfdata *match, void *aux)
-{
-	struct aubus_attach_args *aa = aux;
-
-	return (0);	/* XXX unimplemented! */
-	if (strcmp(aa->aa_name, match->cf_name) == 0)
-		return (1);
-
-	return (0);
-}
-
-void
-aupcmcia_attach(struct device *parent, struct device *self, void *aux)
-{
-
-	printf(": Au1000 PCMCIA\n");	/* \n in clockattach */
-}
diff --git a/sys/arch/evbmips/conf/ALCHEMY b/sys/arch/evbmips/conf/ALCHEMY
index cd2317fb3dab..ccd978683ea2 100644
--- a/sys/arch/evbmips/conf/ALCHEMY
+++ b/sys/arch/evbmips/conf/ALCHEMY
@@ -1,11 +1,11 @@
-#	$NetBSD: ALCHEMY,v 1.7 2006/02/13 04:30:12 gdamore Exp $
+#	$NetBSD: ALCHEMY,v 1.8 2006/02/23 03:34:35 gdamore Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.alchemy"
 
-#ident 		"ALCHEMY-$Revision: 1.7 $"
+#ident 		"ALCHEMY-$Revision: 1.8 $"
 
 maxusers	32
 
@@ -156,6 +156,7 @@ sqphy*		at mii? phy ?			# Seeq 80220/80221/80223 PHYs
 acphy*		at mii? phy ?			# AMD/Altima AC101 PHYs
 rlphy*		at mii? phy ?			# RealTek 8139/8201L PHYs
 rgephy*		at mii? phy ?			# RealTek 8169 PHYs
+lxtphy*		at mii? phy ?			# Level One LXT970 PHYs
 ukphy*		at mii? phy ?			# Catch-all PHYs
 
 # USB
@@ -226,15 +227,9 @@ gpio*	at augpio?
 # On-board devices
 obio*		at mainbus?
 
-aupcmcia*	at obio? addr ?
-pcmcia*		at aupcmcia?
-
 #flash*		at obio? addr ?
 #lcd*		at obio? addr ?
 
-# PCMCIA devices
-wi*		at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
-
 # Pseudo-devices
 
 # Disk/mass storage pseudo-devices
diff --git a/sys/arch/evbmips/conf/files.alchemy b/sys/arch/evbmips/conf/files.alchemy
index f17133822d55..62fe029cf56d 100644
--- a/sys/arch/evbmips/conf/files.alchemy
+++ b/sys/arch/evbmips/conf/files.alchemy
@@ -1,4 +1,4 @@
-#	$NetBSD: files.alchemy,v 1.2 2006/02/09 00:26:39 gdamore Exp $
+#	$NetBSD: files.alchemy,v 1.3 2006/02/23 03:34:35 gdamore Exp $
 
 # Platform support - select just one, please
 defflag		opt_alchemy.h	ALCHEMY_GENERIC
@@ -38,10 +38,6 @@ 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"