Updated for new config etc.

3 files changed, 85 insertions, 64 deletions

diff --git a/sys/arch/pica/conf/GENERIC b/sys/arch/pica/conf/GENERIC
index df6b7810081..b7117683508 100644
--- a/sys/arch/pica/conf/GENERIC
+++ b/sys/arch/pica/conf/GENERIC
@@ -1,4 +1,8 @@
-include		"std.pica"
+#
+#	Generic configuration file for MIPS R4400 PICA system
+#
+
+machine		pica
 
 maxusers	8
 
@@ -36,6 +40,7 @@ options		NFSCLIENT	# Sun NFS-compatible filesystem (client)
 options		NFSSERVER	# Sun NFS-compatible filesystem (server)
 options		KERNFS		# kernel data-structure filesystem
 options		MSDOSFS		# Ability to read write MS-Dos filsystem
+options		CD9660		# ISO 9660 + Rock Ridge file system
 options		FDESC		# user file descriptor filesystem
 #options	UMAPFS		# uid/gid remapping filesystem
 #options	NULLFS		# null layer filesystem
@@ -76,7 +81,8 @@ sd*		at scsibus? target ? lun ?
 st*		at scsibus? target ? lun ?
 cd*		at scsibus? target ? lun ?
 
-pseudo-device	sl		 4	# serial-line IP ports
+pseudo-device	sl		 2	# serial-line IP ports
+pseudo-device	ppp		 2	# serial-line PPP ports
 pseudo-device	pty		64	# pseudo ptys
 pseudo-device	bpfilter	16	# packet filter ports
 pseudo-device	loop
diff --git a/sys/arch/pica/conf/Makefile.pica b/sys/arch/pica/conf/Makefile.pica
index f56ea3f13e6..3675b9f7fda 100644
--- a/sys/arch/pica/conf/Makefile.pica
+++ b/sys/arch/pica/conf/Makefile.pica
@@ -29,17 +29,13 @@ TOUCH=	touch -f -c
 S=	../../../..
 PICA=	../..
 
-LD=ld.kern
-
-INCLUDES= -I. -I$S/arch -I$S -I$S/sys
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -Dpica -D__NetBSD__ ${GP} \
-	-mips2 -mcpu=r4000
-CPPOPTS=${INCLUDES} ${IDENT} -D_KERNEL -Dpica -D__NetBSD__
-.ifdef DEBUG 
-CFLAGS=	${DEBUG} ${COPTS}
-.else
-CFLAGS= -O2 ${COPTS}
-.endif
+LD=ld.ok
+
+INCLUDES=	-I. -I$S/arch -I$S
+CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dpica -D__NetBSD__ ${GP} \
+		-mips2 -mcpu=r4000
+CFLAGS=         ${DEBUG} -O2 -Werror
+AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
@@ -62,15 +58,13 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 # capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
 # is marked as config-dependent.
 
-NORMAL_C=	${CC} -c ${CFLAGS} ${PROF} $<
-NORMAL_C_C=	${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
-
-DRIVER_C=	${CC} -c ${CFLAGS} ${PROF} $<
-DRIVER_C_C=	${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
+NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
 
-PROFILE_C=	${CC} -p -c ${COPTS} $<
+DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
 
-NORMAL_S=	${AS} ${COPTS} $< -o $@
+NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 NORMAL_S_C=	${AS}  ${COPTS} ${PARAM} $< -o $@
 
 %OBJS
@@ -82,6 +76,7 @@ NORMAL_S_C=	${AS}  ${COPTS} ${PARAM} $< -o $@
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
+
 SYSTEM_OBJ=	locore.o fp.o ${OBJS} param.o ioconf.o ${LIBKERN} \
 		${LIBCOMPAT}
 #SYSTEM_DEP=	Makefile symbols.sort ${SYSTEM_OBJ} ${LIBKERN}
@@ -127,11 +122,11 @@ symbols.sort: ${PICA}/pica/symbols.raw
 
 locore.o: ${PICA}/pica/locore.S ${PICA}/include/machAsmDefs.h \
 	${PICA}/include/machConst.h ${PICA}/include/reg.h assym.h
-	${CC} -c ${COPTS} ${PARAM} -DLOCORE -mips3 ${PICA}/pica/locore.S
+	${NORMAL_S} -mips3 ${PICA}/pica/locore.S
 
 fp.o: ${PICA}/pica/fp.S ${PICA}/include/machAsmDefs.h \
 	${PICA}/include/machConst.h ${PICA}/include/reg.h assym.h
-	${CC} -c ${COPTS} ${PARAM} -DLOCORE ${PICA}/pica/fp.S
+	${NORMAL_S} -mips3 ${PICA}/pica/fp.S
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
@@ -149,7 +144,7 @@ assym.h: genassym
 	./genassym >assym.h
 
 genassym: ${PICA}/pica/genassym.c
-	${CC} ${INCLUDES} ${IDENT} ${PARAM} -o genassym ${PICA}/pica/genassym.c
+	${NORMAL_C_C}
 
 depend: assym.h param.c
 	mkdep ${COPTS} ${CFILES} ioconf.c param.c
@@ -167,20 +162,18 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 ioconf.o: ioconf.c
-	${CC} -c ${CFLAGS} ioconf.c
+	${NORMAL_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${CC} -c ${CFLAGS} ${PARAM} param.c
+	${NORMAL_C_C}
 
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh
-	${CC} ${CFLAGS} -c vers.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
 %RULES
 
-
-
diff --git a/sys/arch/pica/conf/files.pica b/sys/arch/pica/conf/files.pica
index 8162762ea00..f3522a83add 100644
--- a/sys/arch/pica/conf/files.pica
+++ b/sys/arch/pica/conf/files.pica
@@ -1,75 +1,99 @@
+#	$OpenBSD: files.pica,v 1.3 1996/05/02 07:59:36 pefo Exp $
 #	$NetBSD: files.pica,v 1.16 1995/04/30 10:11:00 cgd Exp $
+#
+# maxpartitions must be first item in files.${ARCH}
+#
 maxpartitions 8
+
 maxusers 2 8 64
 
-device mainbus at root { }		# no locators
+#	Required files
+
+file	arch/pica/isa/isa.c
+
+file	arch/pica/pica/autoconf.c
+file	arch/pica/pica/conf.c
+file	arch/pica/pica/cpu_exec.c
+file	arch/pica/pica/disksubr.c
+file	arch/pica/dev/dma.c
+file	arch/pica/pica/exec_elf.c
+file	arch/pica/pica/machdep.c
+file	arch/pica/pica/mainbus.c
+file	arch/pica/pica/minidebug.c
+file	arch/pica/pica/mem.c
+file	arch/pica/pica/pmap.c
+file	arch/pica/pica/process_machdep.c
+file	arch/pica/pica/sys_machdep.c
+file	arch/pica/pica/trap.c
+file	arch/pica/pica/vm_machdep.c
+
+#
+# System bus types
+#
+
+device	mainbus {}
+attach	mainbus at root
 
 #	Our CPU configurator
-device cpu at mainbus			# not optional
+device	cpu
+attach	cpu at mainbus			# not optional
 file arch/pica/pica/cpu.c		cpu
 
 #
 #	PICA bus autoconfiguration devices
 #
-device pica at mainbus { }		# { slot = -1, offset = -1 }
+device	pica {}
+attach	pica at mainbus			# { slot = -1, offset = -1 }
 file	arch/pica/pica/pica.c		pica	needs-flag
 
 #	Real time clock, must have one..
-device clock at pica
+device	clock
+attach	clock at pica
 file	arch/pica/pica/clock.c		clock
 file	arch/pica/pica/clock_mc.c	clock
 
 #	Ethernet chip
-device sn at pica: ifnet, ether
+device	sn
+attach	sn at pica: ifnet, ether
 file	arch/pica/dev/if_sn.c		sn	needs-count
 
 #	Use machine independent SCSI driver routines
 include	"../../../scsi/files.scsi"
+major	{sd = 0}
+major	{cd = 3}
 
 #	Machine dependent SCSI interface driver
-device asc at pica: scsi
+device	asc: scsi
+attach	asc at pica
 file	arch/pica/dev/asc.c		asc	needs-count
 
 #	NS16450/16550 Serial line driver
-device com at pica
+device	com
+attach	com at pica
 file	arch/pica/dev/com.c		com	needs-count
 
 #	Paralell printer port driver
-device lpt at pica
+device	lpt
+attach	lpt at pica
 file	arch/pica/dev/lpt.c		lpt	needs-count
 
 #	Console driver on PC-style graphics
-device pc at pica
-device pms at pica
-file	arch/pica/dev/pccons.c		pc pms	needs-count
+device	pc: tty
+attach	pc at pica
+device	pms
+attach	pms at pica
+file	arch/pica/dev/pccons.c		pms	needs-count
 
 #	PS2 type mouse driver.
 
 # Floppy disk controller
-device	fdc at pica {drive = -1}
-device	fd at fdc
-file	arch/pica/dev/fd.c			fdc	needs-flag
+device	fdc {drive = -1}
+attach	fdc at pica
+device	fd: disk
+attach	fd at fdc
+file	arch/pica/dev/fd.c		fdc	needs-flag
 major	{fd = 7}
 
-#	Required files
-
-file	arch/pica/isa/isa.c
-
-file	arch/pica/pica/autoconf.c
-file	arch/pica/pica/conf.c
-file	arch/pica/pica/cpu_exec.c
-file	arch/pica/pica/disksubr.c
-file	arch/pica/dev/dma.c
-file	arch/pica/pica/elf.c
-file	arch/pica/pica/machdep.c
-file	arch/pica/pica/mainbus.c
-file	arch/pica/pica/minidebug.c
-file	arch/pica/pica/mem.c
-file	arch/pica/pica/pmap.c
-file	arch/pica/pica/process_machdep.c
-file	arch/pica/pica/sys_machdep.c
-file	arch/pica/pica/trap.c
-file	arch/pica/pica/vm_machdep.c
 #
 # This is a dummy - don't try to use it:
 
@@ -83,5 +107,3 @@ file	compat/ultrix/ultrix_misc.c		compat_ultrix
 file	compat/ultrix/ultrix_syscalls.c		compat_ultrix
 file	compat/ultrix/ultrix_sysent.c		compat_ultrix
 
-
-# Configs