Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/dnard/conf eliminate a lot stuff that's not needed.



details:   https://anonhg.NetBSD.org/src/rev/cd8ec967c9ff
branches:  trunk
changeset: 504547:cd8ec967c9ff
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Mar 04 20:45:03 2001 +0000

description:
eliminate a lot stuff that's not needed.

diffstat:

 sys/arch/dnard/conf/files.dnard |  154 +++++++++------------------------------
 1 files changed, 37 insertions(+), 117 deletions(-)

diffs (256 lines):

diff -r f6903393a7c1 -r cd8ec967c9ff sys/arch/dnard/conf/files.dnard
--- a/sys/arch/dnard/conf/files.dnard   Sun Mar 04 20:33:03 2001 +0000
+++ b/sys/arch/dnard/conf/files.dnard   Sun Mar 04 20:45:03 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.dnard,v 1.3 2001/02/27 17:56:32 bjh21 Exp $
+#      $NetBSD: files.dnard,v 1.4 2001/03/04 20:45:03 matt Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -19,11 +19,11 @@
 defopt XSERVER
 
 # Bootloader options (COMPAT... to be dropped ASAP)
-defopt COMPAT_OLD_BOOTLOADER
+#defopt        COMPAT_OLD_BOOTLOADER
 
 # Architectures and core logic
-defopt EBSA285
-defopt FOOTBRIDGE
+#defopt        EBSA285
+#defopt        FOOTBRIDGE
 
 define todservice {}
 
@@ -51,9 +51,9 @@
 # Common OFW files
 include "dev/ofw/files.ofw"
 attach ofbus at root with ofbus_root
-file   arch/dnard/ofw/ofw.c                    ofw
-file   arch/dnard/ofw/openfirm.c               ofw
-file   arch/dnard/ofw/oftodclock.c             ofw & (shark | ofwgencfg)
+file   arch/dnard/ofw/ofw.c
+file   arch/dnard/ofw/openfirm.c
+file   arch/dnard/ofw/oftodclock.c             ofwgencfg
 
 # ISA DMA glue
 file   arch/arm32/isa/isadma_machdep.c         isadma
@@ -61,8 +61,6 @@
 # XXX ISA joystick driver
 device joy
 file   arch/arm32/isa/joy.c                    joy needs-flag
-attach joy at isa with joy_isa
-file   arch/arm32/isa/joy_isa.c                joy_isa
 
 # OFW ISA bus driver.
 include "dev/ofisa/files.ofisa"
@@ -74,12 +72,9 @@
 file   arch/dnard/ofw/wdc_ofisa_machdep.c      wdc_ofisa
 
 # Glue for OFW ISA device attachment
-device ofisapc {}
-attach ofisapc at ofbus
-file   arch/dnard/ofw/ofisapc.c                pc & ofw
 device ofisascr {}
 attach ofisascr at ofisa
-file   arch/dnard/ofw/ofisascr.c               scr & ofw
+file   arch/dnard/ofw/ofisascr.c               scr
 
 device ofrom
 attach ofrom at ofbus
@@ -92,18 +87,8 @@
 # RAIDframe
 major  {raid = 71}
 
-# attribute used to represent the "keyboard controller" on the shark
-# XXX should be a real device
-define spckbd { [irq = -1], [port = -1] }
-
-# PS/2 mouse device
-#device        opms: tty
-#file  arch/dnard/dnard/pms.c                  opms & ofw needs-flag
-
-# Ethernet devices
-
 #
-# Machine-independent SCSI drivers
+# Machine-independent SCSI/ATAPI drivers
 #
 
 include "dev/scsipi/files.scsipi"
@@ -111,33 +96,28 @@
 major   {cd = 26}
 
 # Generic MD files
+file   arch/arm32/arm32/ast.c
 file   arch/arm32/arm32/autoconf.c
 file   arch/arm32/arm32/blockio.S
 file   arch/arm32/arm32/bus_dma.c
 file   arch/arm32/arm32/conf.c
+file   arch/arm32/arm32/cpufunc.c
+file   arch/arm32/arm32/cpufunc_asm.S
 file   arch/arm32/arm32/cpuswitch.S
-file   arch/arm32/arm32/disksubr.c             disk
-file   arch/arm32/arm32/disksubr_acorn.c       disk
-file   arch/arm32/arm32/disksubr_mbr.c         disk
-file   arch/arm32/arm32/stubs.c
 file   arch/arm32/arm32/exception.S
-file   arch/arm32/arm32/syscall.c
-file   arch/arm32/arm32/ast.c
 file   arch/arm32/arm32/fault.c
-file   arch/arm32/arm32/undefined.c
+file   arch/arm32/arm32/fusu.S
+file   arch/arm32/arm32/intr.c
+file   arch/arm32/arm32/machdep.c
 file   arch/arm32/arm32/mem.c
 file   arch/arm32/arm32/procfs_machdep.c       procfs
-file   arch/arm32/arm32/machdep.c
-file   arch/arm32/arm32/sys_machdep.c
-file   arch/arm32/arm32/vm_machdep.c
-file   arch/arm32/arm32/pmap.c
-file   arch/arm32/arm32/fusu.S
-file   arch/arm32/arm32/cpufunc.c
-file   arch/arm32/arm32/cpufunc_asm.S
 file   arch/arm32/arm32/setcpsr.S
 file   arch/arm32/arm32/setstack.S
 file   arch/arm32/arm32/spl.S
-file   arch/arm32/arm32/intr.c
+file   arch/arm32/arm32/stubs.c
+file   arch/arm32/arm32/undefined.c
+file   arch/arm32/arm32/vm_machdep.c
+
 file   arch/arm32/dev/bus_space_notimpl.S
 
 # library functions
@@ -146,37 +126,25 @@
 file   arch/arm32/arm32/bcopyinout.S
 file   arch/arm32/arm32/copystr.S
 
-# files related to the shell
-#file  arch/arm32/kshell/kshell_input.c        kshell
-#file  arch/arm32/kshell/kshell_shell.c        kshell
-#file  arch/arm32/kshell/kshell_disassem.c     kshell
-#file  arch/arm32/kshell/kshell_dumphex.c      kshell
-#file  arch/arm32/kshell/kshell_debug.c        kshell
-
-file    dev/cons.c
-file   dev/cninit.c                            !footbridge
+file   dev/cninit.c
 
 # ARM FPE
 file   arch/arm32/fpe-arm/armfpe_glue.S        armfpe
 file   arch/arm32/fpe-arm/armfpe_init.c        armfpe
 file   arch/arm32/fpe-arm/armfpe.s             armfpe
 
-# DDB
-file   arch/arm32/arm32/db_interface.c         ddb
-file   arch/arm32/arm32/db_trace.c             ddb
-file   arch/arm32/arm32/db_machdep.c           ddb
-
 # Shark specific files
-file   arch/dnard/dnard/shark_machdep.c        shark
-file   arch/dnard/dnard/sequoia.c              shark
-file   arch/dnard/dnard/fiq.S                  shark
-file   arch/dnard/dnard/hat.c                  shark
-file   arch/arm32/isa/isa_irqhandler.c         shark
-file   arch/arm32/isa/clock.c                  shark
-file   arch/arm32/isa/isa_irq.S                shark
-file   arch/arm32/isa/isa_shark_machdep.c      shark
-file   arch/arm32/isa/isa_io.c                 shark | isa
-file   arch/arm32/isa/isa_io_asm.S             shark | isa
+file   arch/dnard/dnard/dnard_machdep.c
+file   arch/dnard/dnard/sequoia.c
+file   arch/dnard/dnard/fiq.S
+file   arch/dnard/dnard/hat.c 
+file   arch/dnard/dnard/db_ofw_machdep.c       ddb
+file   arch/arm32/isa/isa_irqhandler.c
+file   arch/arm32/isa/clock.c
+file   arch/arm32/isa/isa_irq.S
+file   arch/dnard/isa/isa_machdep.c
+file   arch/arm32/isa/isa_io.c
+file   arch/arm32/isa/isa_io_asm.S
 
 # OFWGENCFG specific files
 file   arch/arm32/ofw/ofw_irq.S                ofwgencfg
@@ -186,75 +154,27 @@
 
 # National Semiconductor PC97307VUL SuperIO chip configuration routines
 define nsio
-file   arch/dnard/dnard/ns87307.c              nsio & shark
-
-# 8042 microcontroller routines for keyboard and mouse
-#define        i8042
-#file  arch/dnard/dnard/i8042.c                i8042
+file   arch/dnard/dnard/ns87307.c              nsio
 
 defpseudo profiler: disk
 file   arch/dnard/dnard/profile.c              profiler needs-flag
 
+# OFbus VGA WSCONS
 device ofb: wsemuldisplaydev, rasops8
 attach ofb at ofbus
 file   arch/dnard/ofw/ofb.c                    ofb needs-flag
 
-# SHARK pc console
-#device  pc: tty, spckbd, i8042
-#attach  pc at ofisapc
-#file  arch/dnard/dnard/pccons.c               pc & ofw needs-flag
+# OFbus VGA WSCONS
+attach vga at ofbus with vga_ofbus
+file   arch/dnard/ofw/vga_ofbus.c              vga_ofbus needs-flag
 
 # Smart Card Reader
 device  scr: tty
 file   arch/dnard/dnard/scr.c                  scr needs-flag
 attach  scr at ofisascr
 
-# ISA Plug 'n Play autoconfiguration glue.
-#file  arch/arm32/isa/isapnp_machdep.c         isapnp
-
-#device        sysbeep
-#attach        sysbeep at pcppi with sysbeep_isa
-#file  arch/arm32/isa/sysbeep_isa.c                    sysbeep_isa
-
-#attach dsrtc at isa
-#file  arch/arm32/isa/dsrtc.c                          dsrtc
-
-# PCI devices
-
-#
-# Include PCI config
-#
-include "dev/i2o/files.i2o"
-include "dev/pci/files.pci"
-
-# network devices MII bus
-include "dev/mii/files.mii"
-
-device pcib: isabus
-attach pcib at pci
-file   arch/arm32/pci/pcib.c                   pcib
-
-# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
-# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
-# XXX (when the conf/files and files.isa bogons are fixed, this can
-# XXX be fixed as well.)
-
-attach lpt at puc with lpt_puc
-file   dev/pci/lpt_puc.c       lpt_puc
-
-file   arch/arm32/pci/pciide_machdep.c pciide
-
-# Include USB stuff
-include "dev/usb/files.usb"
-
 # Include WSCONS stuff
 include "dev/wscons/files.wscons"
-
+include "dev/wscons/files.rasops"
 include "dev/pckbc/files.pckbc"
 
-#
-# Compatibility modules
-#
-
-# Binary compatibility with previous NetBSD releases (COMPAT_XX)
-file   arch/arm32/arm32/compat_13_machdep.c    compat_13



Home | Main Index | Thread Index | Old Index