diff options
author | Steve Murphree <smurph@cvs.openbsd.org> | 2001-07-06 00:38:20 +0000 |
---|---|---|
committer | Steve Murphree <smurph@cvs.openbsd.org> | 2001-07-06 00:38:20 +0000 |
commit | 7fbec9cbbc02b89d7d6356aa5f748b357490d1bc (patch) | |
tree | 3a16c94e54c1dbee0bfeb0f17c01df21d1d4bd66 /sys/arch | |
parent | 3933f821cb3478c48812f1ec6e063abb420209df (diff) |
misc fixes
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/mvmeppc/conf/Makefile.mvmeppc | 7 | ||||
-rw-r--r-- | sys/arch/mvmeppc/conf/RAMDISK | 4 | ||||
-rw-r--r-- | sys/arch/mvmeppc/conf/files.mvmeppc | 27 |
3 files changed, 22 insertions, 16 deletions
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index 0dae2924c2c..0379f2bf6ec 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.1 2001/06/26 21:57:38 smurph Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.2 2001/07/06 00:38:19 smurph Exp $ # # Makefile for OpenBSD PowerPC # @@ -40,7 +40,7 @@ PPC= ../.. INCLUDES= -I. -I$S/arch -I$S -nostdinc -L${DESTDIR}/usr/include CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \ - -Dpowerpc -Dmvmeppc + -Dpowerpc -D__mvmeppc__ CWARNFLAGS= -Werror -Wreturn-type CFLAGS= ${DEBUG} ${CWARNFLAGS} -O2 -msoft-float AFLAGS= -D_LOCORE @@ -113,6 +113,9 @@ SYSTEM_LD_TAIL+=; \ LINKFLAGS+= -S .endif +bsd.rd: bsd + echo cp $@ $@.rd; ./rdsetroot bsd.rd < mr.fs; + %LOAD assym.h: $S/kern/genassym.sh ${PPC}/mvmeppc/genassym.cf diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK index 05934d0438e..2add29b0784 100644 --- a/sys/arch/mvmeppc/conf/RAMDISK +++ b/sys/arch/mvmeppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.3 2001/06/27 20:43:50 miod Exp $ +# $OpenBSD: RAMDISK,v 1.4 2001/07/06 00:38:19 smurph Exp $ # # MVMEPPC GENERIC config file # @@ -40,7 +40,7 @@ pchb* at pci? # PCI host bridge pcib* at pci? dev ? function ? # PCI-ISA bridge siop* at pci? dev ? function ? #ncr* at pci? dev ? function ? -de* at pci? dev ? function ? +#de* at pci? dev ? function ? #vme* at pci? dev ? function ? #pciide* at pci? dev ? function ? diff --git a/sys/arch/mvmeppc/conf/files.mvmeppc b/sys/arch/mvmeppc/conf/files.mvmeppc index f4f6425062c..8e15d9b44d4 100644 --- a/sys/arch/mvmeppc/conf/files.mvmeppc +++ b/sys/arch/mvmeppc/conf/files.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.mvmeppc,v 1.2 2001/07/04 08:31:30 niklas Exp $ +# $OpenBSD: files.mvmeppc,v 1.3 2001/07/06 00:38:19 smurph Exp $ # # powerpc-specific configuration info @@ -9,11 +9,11 @@ maxusers 2 8 64 file dev/cons.c file dev/cninit.c -file arch/mvmeppc/ddb/setjmp.S ddb -file arch/mvmeppc/ddb/db_memrw.c ddb -file arch/mvmeppc/ddb/db_disasm.c ddb -file arch/mvmeppc/ddb/db_interface.c ddb -file arch/mvmeppc/ddb/db_trace.c ddb +file arch/powerpc/powerpc/setjmp.S ddb +file arch/mvmeppc/ddb/db_memrw.c ddb +file arch/mvmeppc/ddb/db_disasm.c ddb +file arch/mvmeppc/ddb/db_interface.c ddb +file arch/mvmeppc/ddb/db_trace.c ddb file arch/mvmeppc/dev/bugio.c file arch/mvmeppc/dev/clock.c @@ -54,7 +54,7 @@ include "../../../dev/mii/files.mii" define mainbus {} device mainbus attach mainbus at root -file arch/mvmeppc/dev/mainbus.c mainbus +file arch/mvmeppc/dev/mainbus.c mainbus device cpu attach cpu at mainbus @@ -70,6 +70,9 @@ file arch/mvmeppc/dev/openpic.c major {rd = 17} +# I2O +include "../../../dev/i2o/files.i2o" + # PCI bus support # XXX Dummy bus needed for some multi-homed devices specified in files.isa define pcmcia {} @@ -78,28 +81,28 @@ include "dev/pci/files.pci" # XXX some ISA devs are 'at pci' too. # Ethernet driver for DC21140A-based SBCs device vde: ether, ifnet, ifmedia attach vde at pci -file arch/mvmeppc/pci/if_vde.c vde +file arch/mvmeppc/pci/if_vde.c vde device mpcpcibr {} : pcibus attach mpcpcibr at raven -file arch/mvmeppc/pci/mpcpcibr.c mpcpcibr +file arch/mvmeppc/pci/mpcpcibr.c mpcpcibr # PCI-Host bridge chipsets device pchb: pcibus attach pchb at pci -file arch/mvmeppc/pci/pchb.c pchb +file arch/mvmeppc/pci/pchb.c pchb # # ISA Bus devices # include "dev/isa/files.isa" include "dev/isa/files.isapnp" -file arch/mvmeppc/isa/isa_machdep.c isa +file arch/mvmeppc/isa/isa_machdep.c isa # PCI-ISA bridge chipsets device pcib: isabus attach pcib at pci -file arch/mvmeppc/pci/pcib.c pcib +file arch/mvmeppc/pci/pcib.c pcib include "dev/pckbc/files.pckbc" |