Moving around files for new mips arch layout

4 files changed, 33 insertions, 21 deletions

diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 3155c8ed6f4..57c1d054877 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,9 +1,9 @@
-#	$OpenBSD: GENERIC,v 1.23 1997/11/11 20:17:46 niklas Exp $
+#	$OpenBSD: GENERIC,v 1.24 1998/01/28 13:46:01 pefo Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
 
-machine		arc
+machine		arc mips
 
 maxusers	32
 
diff --git a/sys/arch/arc/conf/Makefile.arc b/sys/arch/arc/conf/Makefile.arc
index 7a52c5d757e..4f4ced253cc 100644
--- a/sys/arch/arc/conf/Makefile.arc
+++ b/sys/arch/arc/conf/Makefile.arc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.arc,v 1.9 1997/09/15 02:40:26 deraadt Exp $
+#	$OpenBSD: Makefile.arc,v 1.10 1998/01/28 13:46:02 pefo Exp $
 
 #	@(#)Makefile.arc	8.2 (Berkeley) 2/16/94
 #
@@ -34,6 +34,7 @@ TOUCH?=	touch -f -c
 # source tree is located via $S relative to the compilation directory
 S=	../../../..
 ARC=	../..
+MIPS=	../../../mips
 
 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Darc
@@ -124,13 +125,13 @@ symbols.sort: ${ARC}/arc/symbols.raw
 	grep -v '^#' ${ARC}/arc/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
-locore.o: ${ARC}/arc/locore.S ${ARC}/include/asm.h \
-	${ARC}/include/cpu.h ${ARC}/include/reg.h assym.h
+locore.o: ${ARC}/arc/locore.S ${MIPS}/include/asm.h \
+	${MIPS}/include/cpu.h ${MIPS}/include/reg.h assym.h
 	${NORMAL_S} -mips3 ${ARC}/arc/locore.S
 
-fp.o: ${ARC}/arc/fp.S ${ARC}/include/asm.h \
-	${ARC}/include/cpu.h ${ARC}/include/reg.h assym.h
-	${NORMAL_S} -mips3 ${ARC}/arc/fp.S
+fp.o: ${MIPS}/mips/fp.S ${MIPS}/include/asm.h \
+	${ARC}/include/cpu.h ${MIPS}/include/reg.h assym.h
+	${NORMAL_S} -mips3 ${MIPS}/mips/fp.S
 
 # the following are necessary because the files depend on the types of
 # cpu's included in the system configuration
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 0c24354f712..6e71f4edade 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.6 1997/08/01 11:31:23 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.7 1998/01/28 13:46:03 pefo Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -72,6 +72,8 @@ cpu*		at mainbus0
 
 pica*		at mainbus0	# ACER Pica systems local bus.
 isabr*		at mainbus0	# ISA Bus bridge (std ISA bus).
+algor*		at mainbus0	# P4032 PCI Bridge.
+pbcpcibr*	at mainbus0	# PCI Bus bridge.
 
 #### PICA bus devices
 
@@ -89,6 +91,13 @@ fd*		at fdc? drive ?
 asc0		at pica?
 scsibus* 	at asc?
 
+#### Algor bus devices
+
+clock0		at algor?
+com0		at algor?
+com1		at algor?
+lpt0		at algor?
+
 #### ISA Bus.
 
 isa*		at isabr?
@@ -117,6 +126,15 @@ ed2    		at isa? port 0x300 iomem 0xcc000 irq 10 #
 btl0		at isa? port 0x330 irq ? drq ?
 scsibus* 	at btl?
 
+#### PCI Bus
+
+pci*		at pbcpcibr?
+
+de*		at pci? dev ? function ?
+ncr*		at pci? dev ? function ?
+scsibus*	at ncr?
+
+
 #### SCSI Bus devices
 
 sd*		at scsibus? target ? lun ?
@@ -137,7 +155,7 @@ pseudo-device	ppp		 2	# serial-line PPP ports
 #pseudo-device	pty		64	# pseudo ptys
 #pseudo-device	tb		 1	# tablet line discipline
 #pseudo-device	vnd		 4	# paging to files
-#pseudo-device   ccd		 4	# concatenated disk devices
+#pseudo-device	ccd		 4	# concatenated disk devices
 pseudo-device	rd		 1	# Ram disk.
 
 # RAMDISK stuff
diff --git a/sys/arch/arc/conf/files.arc b/sys/arch/arc/conf/files.arc
index 493e741141a..d215e6bc1f2 100644
--- a/sys/arch/arc/conf/files.arc
+++ b/sys/arch/arc/conf/files.arc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.arc,v 1.16 1997/12/27 12:13:13 niklas Exp $
+#	$OpenBSD: files.arc,v 1.17 1998/01/28 13:46:03 pefo Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -10,19 +10,13 @@ maxusers 2 8 64
 
 file	arch/arc/arc/autoconf.c
 file	arch/arc/arc/conf.c
-file	arch/arc/arc/cpu_exec.c
-file	arch/arc/arc/disksubr.c
 file	arch/arc/dev/dma.c
 file	arch/arc/arc/machdep.c
-file	arch/arc/arc/minidebug.c
-file	arch/arc/arc/mem.c
 file	arch/arc/arc/pmap.c
-file	arch/arc/arc/process_machdep.c
-file	arch/arc/arc/sys_machdep.c
 file	arch/arc/arc/trap.c
 file	arch/arc/arc/vm_machdep.c
 
-file	arch/arc/arc/arcbios.c
+file	arch/mips/mips/arcbios.c
 
 #
 #	Machine-independent ATAPI drivers 
@@ -36,12 +30,12 @@ major	{ acd = 5 }
 define	mainbus {}
 device	mainbus
 attach	mainbus at root
-file	arch/arc/arc/mainbus.c	mainbus
+file	arch/mips/mips/mainbus.c	mainbus
 
 #	Our CPU configurator
 device	cpu
 attach	cpu at mainbus			# not optional
-file arch/arc/arc/cpu.c			cpu
+file arch/mips/mips/cpu.c		cpu
 
 #
 #	PICA bus autoconfiguration devices
@@ -108,7 +102,6 @@ device	clock
 attach	clock at pica with clock_pica
 attach	clock at isa with clock_isa
 attach	clock at algor with clock_algor
-file	arch/arc/arc/clock.c	clock & (clock_isa | clock_pica | clock_algor) needs-flag
 file	arch/arc/arc/clock_mc.c	clock & (clock_isa | clock_pica | clock_algor) needs-flag
 
 #	Console driver on PC-style graphics