[src/trunk]: src/sys/arch Resolve build failures caused by local use of "devi...

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

details:   https://anonhg.NetBSD.org/src/rev/12b15173f0ac
branches:  trunk
changeset: 762828:12b15173f0ac
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Wed Mar 02 08:25:08 2011 +0000

description:
Resolve build failures caused by local use of "device flash" in config.

diffstat:

 sys/arch/evbppc/conf/PMPPC          |  4 ++--
 sys/arch/evbppc/conf/files.pmppc    |  8 ++++----
 sys/arch/hpcmips/conf/LCARD         |  6 +++---
 sys/arch/hpcmips/conf/files.hpcmips |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (81 lines):

diff -r 07cd84bbbd77 -r 12b15173f0ac sys/arch/evbppc/conf/PMPPC
--- a/sys/arch/evbppc/conf/PMPPC        Wed Mar 02 06:23:17 2011 +0000
+++ b/sys/arch/evbppc/conf/PMPPC        Wed Mar 02 08:25:08 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: PMPPC,v 1.18 2011/01/18 01:07:06 matt Exp $
+#      $NetBSD: PMPPC,v 1.19 2011/03/02 08:25:08 ahoka Exp $
 #
 #      PMPPC
 #
@@ -143,7 +143,7 @@
 cs0    at mainbus0 addr 0x7fe00000
 
 # flash driver not implemented
-#flash0        at mainbus0 addr 0x70000000
+#pmflash0      at mainbus0 addr 0x70000000
 
 # UARTs
 com0   at cpc0 addr 0xff600300
diff -r 07cd84bbbd77 -r 12b15173f0ac sys/arch/evbppc/conf/files.pmppc
--- a/sys/arch/evbppc/conf/files.pmppc  Wed Mar 02 06:23:17 2011 +0000
+++ b/sys/arch/evbppc/conf/files.pmppc  Wed Mar 02 08:25:08 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pmppc,v 1.4 2008/02/20 21:43:34 drochner Exp $
+#      $NetBSD: files.pmppc,v 1.5 2011/03/02 08:25:08 ahoka Exp $
 #
 #
 maxpartitions 16
@@ -46,9 +46,9 @@
 attach rtc at mainbus
 file   arch/evbppc/pmppc/dev/ds17485.c         rtc
 
-device flash
-attach flash at mainbus
-file   arch/evbppc/pmppc/dev/flash.c                   flash
+device pmflash
+attach pmflash at mainbus
+file   arch/evbppc/pmppc/dev/flash.c                   pmflash
 
 attach cpc at mainbus with cpc_mainbus
 file   arch/evbppc/pmppc/dev/cpc_mainbus.c             cpc_mainbus
diff -r 07cd84bbbd77 -r 12b15173f0ac sys/arch/hpcmips/conf/LCARD
--- a/sys/arch/hpcmips/conf/LCARD       Wed Mar 02 06:23:17 2011 +0000
+++ b/sys/arch/hpcmips/conf/LCARD       Wed Mar 02 08:25:08 2011 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: LCARD,v 1.12 2010/11/23 11:13:59 hannken Exp $
+#      $NetBSD: LCARD,v 1.13 2011/03/02 08:25:08 ahoka Exp $
 #
 include                "arch/hpcmips/conf/std.lcard"
 
@@ -69,8 +69,8 @@
 
 wi*    at pcmcia? function ?           # Lucent WaveLan IEEE (802.11)
 
-flash0 at vr4181ip? addr 0x1f800000 size 0x800000
-flash1 at vr4181ip? addr 0x1e000000 size 0x800000
+vrflash0       at vr4181ip? addr 0x1f800000 size 0x800000
+vrflash1       at vr4181ip? addr 0x1e000000 size 0x800000
 
 pseudo-device  md                      # memory disk device (ramdisk)
 pseudo-device  rnd                     # /dev/random and in-kernel generator
diff -r 07cd84bbbd77 -r 12b15173f0ac sys/arch/hpcmips/conf/files.hpcmips
--- a/sys/arch/hpcmips/conf/files.hpcmips       Wed Mar 02 06:23:17 2011 +0000
+++ b/sys/arch/hpcmips/conf/files.hpcmips       Wed Mar 02 08:25:08 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.hpcmips,v 1.103 2009/08/21 03:56:58 thorpej Exp $
+#      $NetBSD: files.hpcmips,v 1.104 2011/03/02 08:25:09 ahoka Exp $
 
 # maxpartitions must be first item in files.${ARCH}.
 maxpartitions 8
@@ -445,8 +445,8 @@
 file arch/hpcmips/vr/vr4181aiu.c       vr4181aiu       needs-flag
 
 # Flash memory on L-card+      XXX should not be here
-device flash
-attach flash at vripif with flash_vrip
+device vrflash
+attach vrflash at vripif with flash_vrip
 file arch/hpcmips/vr/flash_vrip.c      flash_vrip      needs-flag
 
 # OptPoint on Telios HC-AJ2