[src/trunk]: src/sys/arch/evbarm/conf Don't require INTEGRATOR or INTEGRATOR_...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c95ecf9481d0
branches:  trunk
changeset: 516987:c95ecf9481d0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Nov 04 02:56:13 2001 +0000

description:
Don't require INTEGRATOR or INTEGRATOR_FPGA options.  Made possible
by files.<board>.

diffstat:

 sys/arch/evbarm/conf/INTEGRATOR       |  5 +----
 sys/arch/evbarm/conf/files.integrator |  8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diffs (42 lines):

diff -r 6c06c4e7df25 -r c95ecf9481d0 sys/arch/evbarm/conf/INTEGRATOR
--- a/sys/arch/evbarm/conf/INTEGRATOR   Sun Nov 04 02:38:28 2001 +0000
+++ b/sys/arch/evbarm/conf/INTEGRATOR   Sun Nov 04 02:56:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INTEGRATOR,v 1.2 2001/10/29 14:23:35 rearnsha Exp $
+#      $NetBSD: INTEGRATOR,v 1.3 2001/11/04 02:56:13 thorpej Exp $
 #
 #      GENERIC -- ARM Integrator board Generic kernel
 #
@@ -22,9 +22,6 @@
 makeoptions    COPTS="-O2 -march=armv4"
 
 # Architecture options
-# Core logic on the integrator is a custom FPGA
-options                INTEGRATOR_FPGA # Core logic is on the motherboard FPGA
-options        INTEGRATOR      # We are an INTEGRATOR
 
 # FPA options
 # We will want VFP support here sometime
diff -r 6c06c4e7df25 -r c95ecf9481d0 sys/arch/evbarm/conf/files.integrator
--- a/sys/arch/evbarm/conf/files.integrator     Sun Nov 04 02:38:28 2001 +0000
+++ b/sys/arch/evbarm/conf/files.integrator     Sun Nov 04 02:56:13 2001 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: files.integrator,v 1.1 2001/11/04 02:20:22 thorpej Exp $
+#      $NetBSD: files.integrator,v 1.2 2001/11/04 02:56:13 thorpej Exp $
 #
 # ARM, Ltd. Integrator evaluation board configuraiton info
 #
 
-file   arch/evbarm/integrator/integrator_machdep.c     integrator
-file   arch/evbarm/integrator/int_bus_dma.c            integrator
+file   arch/evbarm/integrator/integrator_machdep.c
+file   arch/evbarm/integrator/int_bus_dma.c
 
 # Integrator fpga specific files
 device ifpga {[offset = -1], [irq = -1]}: pcibus
@@ -33,4 +33,4 @@
 file   arch/evbarm/ifpga/pl030_rtc.c           plrtc
 
 # Integrator PCI support
-file   arch/evbarm/integrator/pci_machdep.c    pci & integrator
+file   arch/evbarm/integrator/pci_machdep.c    pci