[src/trunk]: src/sys/arch/evbarm/conf We need to declare the "plcom" device i...

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

details:   https://anonhg.NetBSD.org/src/rev/170494612164
branches:  trunk
changeset: 517568:170494612164
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Nov 14 23:47:51 2001 +0000

description:
We need to declare the "plcom" device in files.evbarm, since a
"plcom.h" header file needs to be generated for conf.c even for
non-Integrator kernels.

diffstat:

 sys/arch/evbarm/conf/files.evbarm     |  17 +++++++++++------
 sys/arch/evbarm/conf/files.integrator |   7 ++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r 5f1bf03100a8 -r 170494612164 sys/arch/evbarm/conf/files.evbarm
--- a/sys/arch/evbarm/conf/files.evbarm Wed Nov 14 23:19:11 2001 +0000
+++ b/sys/arch/evbarm/conf/files.evbarm Wed Nov 14 23:47:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.evbarm,v 1.4 2001/11/04 02:38:28 thorpej Exp $
+#      $NetBSD: files.evbarm,v 1.5 2001/11/14 23:47:51 thorpej Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -64,9 +64,14 @@
 include "dev/usb/files.usb"                    # USB device
 include "dev/cardbus/files.cardbus"            # CARDBus device
 
-# 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.)
+file   arch/evbarm/pci/pciide_machdep.c        pciide
+
+#
+# ARM evaluation board specific devices
+#
 
-file   arch/evbarm/pci/pciide_machdep.c        pciide
+# We need to define the Integrator's "plcom" device here since
+# it we need to generate a "plcom.h" header file for conf.c
+defopt opt_plcom.h     PLCOM_DEBUG PLCOM_MPLOCK
+device plcom { }: tty
+file   arch/evbarm/dev/plcom.c                 plcom needs-flag
diff -r 5f1bf03100a8 -r 170494612164 sys/arch/evbarm/conf/files.integrator
--- a/sys/arch/evbarm/conf/files.integrator     Wed Nov 14 23:19:11 2001 +0000
+++ b/sys/arch/evbarm/conf/files.integrator     Wed Nov 14 23:47:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.integrator,v 1.2 2001/11/04 02:56:13 thorpej Exp $
+#      $NetBSD: files.integrator,v 1.3 2001/11/14 23:47:51 thorpej Exp $
 #
 # ARM, Ltd. Integrator evaluation board configuraiton info
 #
@@ -18,10 +18,7 @@
 file   arch/evbarm/ifpga/ifpga_pci.c           ifpga & pci
 
 # Integrator fpga serial port
-defopt opt_plcom.h     PLCOM_DEBUG PLCOM_MPLOCK
-device plcom { } : tty
-file   arch/evbarm/dev/plcom.c                 plcom needs-flag
-
+# "device" declaration in files.evbarm (because of needs-flag)
 attach plcom at ifpga with plcom_ifpga
 file   arch/evbarm/ifpga/plcom_ifpga.c         plcom_ifpga
 #file  arch/evbarm/ifpga/pl010_uart_io.c       plcom