From cefa712681ad9a6f0fb2e16a845433d89f478bbe Mon Sep 17 00:00:00 2001 From: soda Date: Wed, 13 Jun 2001 15:37:27 +0000 Subject: [PATCH] update configurations for "struct platform" and related changes --- sys/arch/arc/conf/ARCTIC | 22 ++++-- sys/arch/arc/conf/GENERIC | 67 +++++++++++++------ sys/arch/arc/conf/M403 | 29 +++++--- sys/arch/arc/conf/MIMORI | 43 ++++++++---- sys/arch/arc/conf/PCCONS | 83 +++++++++++++++-------- sys/arch/arc/conf/PICA | 31 ++++++--- sys/arch/arc/conf/RAMDISK | 94 ++++++++++++++++++-------- sys/arch/arc/conf/files.arc | 130 ++++++++++++++++++++++++++---------- 8 files changed, 358 insertions(+), 141 deletions(-) diff --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC index 68c9309fe71f..7c383418ebec 100644 --- a/sys/arch/arc/conf/ARCTIC +++ b/sys/arch/arc/conf/ARCTIC @@ -1,4 +1,4 @@ -# $NetBSD: ARCTIC,v 1.10 2001/05/21 03:37:30 soda Exp $ +# $NetBSD: ARCTIC,v 1.11 2001/06/13 15:37:27 soda Exp $ # $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $ # # configuration file for DeskStation @@ -8,6 +8,10 @@ include "arch/arc/conf/std.arc" maxusers 32 # estimated number of users +# Platform support +options PLATFORM_DESKTECH_ARCSTATION_I # DESKstation rPC44 +options PLATFORM_DESKTECH_TYNE # DESKstation Tyne + # Misc. arc-specific options options PCCONS_FORCE_WORD # Max out at 16bit accesses to the # VGA memory @@ -123,13 +127,21 @@ cpu* at mainbus0 #### ISA bus devices -isabr* at mainbus0 # ISA Bus bridge (std ISA bus). -isa* at isabr? +# PLATFORM_DESKTECH_ARCSTATION_I +arcsisabr* at mainbus0 # DESKstation rPC44 ISA host bridge. +isa* at arcsisabr? + +# PLATFORM_DESKTECH_TYNE +tyneisabr* at mainbus0 # DESKstation Tyne ISA host bridge. +isa* at tyneisabr? + #isadma0 at isa? -aclock0 at isa? port 0x70 irq 0 +timer0 at isa? port 0x40 irq 0 +mcclock0 at isa? port 0x70 -pc0 at isa? port 0x60 irq 1 # generic PC console device +pc0 at isa? irq 1 # generic PC console device +opms0 at isa? irq 12 # PS/2 auxiliary port mouse #vga0 at isa? #pckbc0 at isa? # PC keyboard controller com0 at isa? port 0x3f8 irq 4 diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC index 702019c52203..c9ba2ae8b884 100644 --- a/sys/arch/arc/conf/GENERIC +++ b/sys/arch/arc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.44 2001/06/03 13:46:57 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.45 2001/06/13 15:37:27 soda Exp $ # $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $ # # GENERIC -- everything that's currently supported @@ -6,10 +6,22 @@ include "arch/arc/conf/std.arc" -#ident "GENERIC-$Revision: 1.44 $" +#ident "GENERIC-$Revision: 1.45 $" maxusers 32 # estimated number of users +# Platform support +options PLATFORM_ACER_PICA_61 # Pica, NEC ImageRISCstation +options PLATFORM_DESKTECH_ARCSTATION_I # DESKstation rPC44 +options PLATFORM_DESKTECH_TYNE # DESKstation Tyne +options PLATFORM_MICROSOFT_JAZZ # MIPS Magnum +options PLATFORM_NEC_JC94 # NEC Express 5800/230 PCI R4K +options PLATFORM_NEC_R94 # NEC RISCstation 2200 EISA +options PLATFORM_NEC_R96 # NEC Express RISCserver, RISCserver 2200 +options PLATFORM_NEC_RAX94 # NEC RISCstation 2200 PCI +options PLATFORM_NEC_RD94 # NEC RISCstation 2250 +options PLATFORM_SNI_RM200PCI + # Standard system options options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT @@ -123,8 +135,17 @@ cpu* at mainbus0 #### Jazz-Internal bus devices -jazzio* at mainbus0 # Jazz-Internal bus. -aclock0 at jazzio? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 +jazzio* at mainbus0 # Jazz-Internal bus host bridge. + +timer0 at jazzio? +mcclock0 at jazzio? #pc0 at jazzio? #opms0 at jazzio? vga0 at jazzio? # Jazz localbus VGA @@ -150,13 +171,28 @@ scsibus* at osiop? #### ISA bus devices -isabr* at mainbus0 # ISA Bus bridge (std ISA bus). -isa* at isabr? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +jazzisabr* at mainbus0 # Jazz-(E)ISA bus bridge. +isa* at jazzisabr? + +# PLATFORM_DESKTECH_ARCSTATION_I +arcsisabr* at mainbus0 # DESKstation rPC44 ISA host bridge. +isa* at arcsisabr? + +# PLATFORM_DESKTECH_TYNE +tyneisabr* at mainbus0 # DESKstation Tyne ISA host bridge. +isa* at tyneisabr? + #isadma0 at isa? -aclock0 at isa? port 0x70 irq 0 +timer0 at isa? port 0x40 irq 0 +mcclock0 at isa? port 0x70 -pc0 at isa? port 0x60 irq 1 # generic PC console device +pc0 at isa? irq 1 # generic PC console device +opms0 at isa? irq 12 # PS/2 auxiliary port mouse #vga0 at isa? #pckbc0 at isa? # PC keyboard controller com0 at isa? port 0x3f8 irq 4 @@ -214,23 +250,14 @@ lpt0 at isa? port 0x378 irq 7 #btl0 at isa? port 0x330 irq ? drq ? #scsibus* at btl? -#### Algor bus devices - -#algor* at mainbus0 # Algorithmics local bus. - -#aclock0 at algor? -#com0 at algor? -#com1 at algor? -#lpt0 at algor? - #### PCI bus devices +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 necpb* at mainbus0 # NEC RISCstation PCI host bridge. pci* at necpb? -#pbcpcibr* at mainbus0 # Algorithmics PCI bus bridge. -#pci* at pbcpcibr? - #pcivga* at pci? dev ? function ? tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics diff --git a/sys/arch/arc/conf/M403 b/sys/arch/arc/conf/M403 index 4d0d82eed43e..d889bf7c3869 100644 --- a/sys/arch/arc/conf/M403 +++ b/sys/arch/arc/conf/M403 @@ -1,4 +1,4 @@ -# $NetBSD: M403,v 1.12 2001/05/21 03:37:31 soda Exp $ +# $NetBSD: M403,v 1.13 2001/06/13 15:37:27 soda Exp $ # # configuration file for MIPS Magnum 4000 system # @@ -7,6 +7,9 @@ include "arch/arc/conf/std.arc" maxusers 32 # estimated number of users +# Platform support +options PLATFORM_MICROSOFT_JAZZ # MIPS Magnum + # Standard system options options RTC_OFFSET=-540 # hardware clock is this many mins. (Japan) @@ -118,11 +121,19 @@ cpu* at mainbus0 #### Jazz-Internal bus devices -jazzio* at mainbus0 # Jazz-Internal bus. -aclock0 at jazzio? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 +jazzio* at mainbus0 # Jazz-Internal bus host bridge. + +timer0 at jazzio? +mcclock0 at jazzio? #pc0 at jazzio? #opms0 at jazzio? -vga0 at jazzio? # Jazz localbus VGA pckbc0 at jazzio? # PC keyboard controller options COM_FREQ_MAGNUM=8192000 # 8.192 MHz - NEC M403 com0 at jazzio? @@ -138,8 +149,12 @@ scsibus* at asc? #### ISA bus devices -isabr* at mainbus0 # ISA Bus bridge (std ISA bus). -isa* at isabr? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +jazzisabr* at mainbus0 # Jazz-(E)ISA bus bridge. +isa* at jazzisabr? com2 at isa? port 0x3f8 irq 4 com3 at isa? port 0x2f8 irq 3 @@ -155,8 +170,6 @@ uk* at scsibus? target ? lun ? #### Workstation Console attachments -wsdisplay* at vga? -#wsdisplay* at tga? pckbd* at pckbc? # PC keyboard (kbd port) wskbd* at pckbd? pms* at pckbc? # PS/2-style mouse (aux port) diff --git a/sys/arch/arc/conf/MIMORI b/sys/arch/arc/conf/MIMORI index 6f2baacac250..c0ce94007608 100644 --- a/sys/arch/arc/conf/MIMORI +++ b/sys/arch/arc/conf/MIMORI @@ -1,4 +1,4 @@ -# $NetBSD: MIMORI,v 1.4 2000/12/24 09:25:25 ur Exp $ +# $NetBSD: MIMORI,v 1.5 2001/06/13 15:37:27 soda Exp $ # NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp # # MIMORI -- My NEC RISCstation 2250 (ur) @@ -8,6 +8,9 @@ include "arch/arc/conf/std.arc" maxusers 32 # estimated number of users +# Platform support +options PLATFORM_NEC_RD94 # NEC RISCstation 2250 + # Standard system options options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT @@ -72,6 +75,7 @@ options SOFTDEP # FFS soft updates support. options NFSSERVER # Network File System server #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. + # Networking options #options GATEWAY # IP packet forwarding options INET # IP + ICMP + TCP + UDP @@ -120,8 +124,17 @@ cpu* at mainbus0 #### Jazz-Internal bus devices -jazzio* at mainbus0 # Jazz-Internal bus. -aclock0 at jazzio? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 +jazzio* at mainbus0 # Jazz-Internal bus host bridge. + +timer0 at jazzio? +mcclock0 at jazzio? #pc0 at jazzio? #opms0 at jazzio? #vga0 at jazzio? # Jazz localbus VGA @@ -134,19 +147,28 @@ sn0 at jazzio? fdc0 at jazzio? fd* at fdc? drive ? -#siop0 at jazzio? -#scsibus* at siop? +#oosiop0 at jazzio? # NCR53C700 SCSI +#oosiop1 at jazzio? +#scsibus* at oosiop? #### PCI bus devices +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 necpb* at mainbus0 # NEC RISCstation PCI host bridge. pci* at necpb? #pcivga* at pci? dev ? function ? -#siop* at pci? dev ? function ? -#scsibus* at siop? -#de* at pci? dev ? function ? +tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics +ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI +scsibus* at ahc? + +#siop* at pci? dev ? function ? # NCR/Symbios 53c8xx SCSI +#scsibus* at siop? + +#de* at pci? dev ? function ? ex* at pci? dev ? function ? # 3Com 90x[B] fxp* at pci? dev ? function ? # Intel EtherExpress PRO le* at pci? dev ? function ? # PCnet-PCI @@ -166,10 +188,6 @@ pciide* at pci ? dev ? function ? flags 0x0000 wd* at pciide? channel ? drive ? flags 0x0000 atapibus* at pciide? channel ? -tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI -scsibus* at ahc? - #### MII/PHY support exphy* at mii? phy ? # 3Com internal PHYs @@ -233,6 +251,7 @@ pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003) pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation +#pseudo-device vlan # IEEE 802.1q encapsulation # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals diff --git a/sys/arch/arc/conf/PCCONS b/sys/arch/arc/conf/PCCONS index 326701e15e41..fa1042688410 100644 --- a/sys/arch/arc/conf/PCCONS +++ b/sys/arch/arc/conf/PCCONS @@ -1,4 +1,4 @@ -# $NetBSD: PCCONS,v 1.6 2001/05/21 03:37:31 soda Exp $ +# $NetBSD: PCCONS,v 1.7 2001/06/13 15:37:27 soda Exp $ # $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $ # # PCCONS -- generic but pccons rather than wscons @@ -8,6 +8,18 @@ include "arch/arc/conf/std.arc" maxusers 32 # estimated number of users +# Platform support +options PLATFORM_ACER_PICA_61 # Pica, NEC ImageRISCstation +options PLATFORM_DESKTECH_ARCSTATION_I # DESKstation rPC44 +options PLATFORM_DESKTECH_TYNE # DESKstation Tyne +options PLATFORM_MICROSOFT_JAZZ # MIPS Magnum +options PLATFORM_NEC_JC94 # NEC Express 5800/230 PCI R4K +options PLATFORM_NEC_R94 # NEC RISCstation 2200 EISA +options PLATFORM_NEC_R96 # NEC Express RISCserver, RISCserver 2200 +options PLATFORM_NEC_RAX94 # NEC RISCstation 2200 PCI +options PLATFORM_NEC_RD94 # NEC RISCstation 2250 +options PLATFORM_SNI_RM200PCI + # Standard system options options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT @@ -121,8 +133,17 @@ cpu* at mainbus0 #### Jazz-Internal bus devices -jazzio* at mainbus0 # Jazz-Internal bus. -aclock0 at jazzio? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 +jazzio* at mainbus0 # Jazz-Internal bus host bridge. + +timer0 at jazzio? +mcclock0 at jazzio? pc0 at jazzio? opms0 at jazzio? com0 at jazzio? @@ -146,13 +167,28 @@ scsibus* at osiop? #### ISA bus devices -isabr* at mainbus0 # ISA Bus bridge (std ISA bus). -isa* at isabr? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +jazzisabr* at mainbus0 # Jazz-(E)ISA bus bridge. +isa* at jazzisabr? + +# PLATFORM_DESKTECH_ARCSTATION_I +arcsisabr* at mainbus0 # DESKstation rPC44 ISA host bridge. +isa* at arcsisabr? + +# PLATFORM_DESKTECH_TYNE +tyneisabr* at mainbus0 # DESKstation Tyne ISA host bridge. +isa* at tyneisabr? + #isadma0 at isa? -aclock0 at isa? port 0x70 irq 0 +timer0 at isa? port 0x40 irq 0 +mcclock0 at isa? port 0x70 -pc0 at isa? port 0x60 irq 1 # generic PC console device +pc0 at isa? irq 1 # generic PC console device +opms0 at isa? irq 12 # PS/2 auxiliary port mouse #vga0 at isa? #pckbc0 at isa? # PC keyboard controller com0 at isa? port 0x3f8 irq 4 @@ -210,28 +246,27 @@ lpt0 at isa? port 0x378 irq 7 #btl0 at isa? port 0x330 irq ? drq ? #scsibus* at btl? -#### Algor bus devices - -#algor* at mainbus0 # Algorithmics local bus. - -#aclock0 at algor? -#com0 at algor? -#com1 at algor? -#lpt0 at algor? - #### PCI bus devices +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 necpb* at mainbus0 # NEC RISCstation PCI host bridge. pci* at necpb? -#pbcpcibr* at mainbus0 # Algorithmics PCI bus bridge. -#pci* at pbcpcibr? - #pcivga* at pci? dev ? function ? -#siop* at pci? dev ? function ? -#scsibus* at siop? -#de* at pci? dev ? function ? +tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics +ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI +scsibus* at ahc? + +iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI +scsibus* at iha? + +#siop* at pci? dev ? function ? # NCR/Symbios 53c8xx SCSI +#scsibus* at siop? + +#de* at pci? dev ? function ? ex* at pci? dev ? function ? # 3Com 90x[B] fxp* at pci? dev ? function ? # Intel EtherExpress PRO le* at pci? dev ? function ? # PCnet-PCI @@ -251,10 +286,6 @@ pciide* at pci ? dev ? function ? flags 0x0000 wd* at pciide? channel ? drive ? flags 0x0000 atapibus* at pciide? channel ? -tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI -scsibus* at ahc? - #### MII/PHY support exphy* at mii? phy ? # 3Com internal PHYs diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA index 0f74d17924b1..e1dcd7f85d91 100644 --- a/sys/arch/arc/conf/PICA +++ b/sys/arch/arc/conf/PICA @@ -1,4 +1,4 @@ -# $NetBSD: PICA,v 1.25 2001/05/21 03:37:31 soda Exp $ +# $NetBSD: PICA,v 1.26 2001/06/13 15:37:27 soda Exp $ # # configuration file for ACER PICA system # @@ -7,6 +7,9 @@ include "arch/arc/conf/std.arc" maxusers 32 # estimated number of users +# Platform support +options PLATFORM_ACER_PICA_61 # Pica, NEC ImageRISCstation + # Standard system options options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT @@ -118,8 +121,17 @@ cpu* at mainbus0 #### Jazz-Internal bus devices -jazzio* at mainbus0 # Jazz-Internal bus. -aclock0 at jazzio? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 +jazzio* at mainbus0 # Jazz-Internal bus host bridge. + +timer0 at jazzio? +mcclock0 at jazzio? #pc0 at jazzio? #opms0 at jazzio? vga0 at jazzio? # Jazz localbus VGA @@ -132,16 +144,17 @@ sn0 at jazzio? fdc0 at jazzio? fd* at fdc? drive ? -asc0 at jazzio? +asc0 at jazzio? # NCR53C9x SCSI scsibus* at asc? -#siop0 at jazzio? -#scsibus* at siop? - #### ISA bus devices -isabr* at mainbus0 # ISA Bus bridge (std ISA bus). -isa* at isabr? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +jazzisabr* at mainbus0 # Jazz-(E)ISA bus bridge. +isa* at jazzisabr? com2 at isa? port 0x3f8 irq 4 com3 at isa? port 0x2f8 irq 3 diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK index f12adaac0ac9..f63b76a3f3a8 100644 --- a/sys/arch/arc/conf/RAMDISK +++ b/sys/arch/arc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.13 2001/05/21 03:37:31 soda Exp $ +# $NetBSD: RAMDISK,v 1.14 2001/06/13 15:37:28 soda Exp $ # $OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $ # # memory disk based configuration file for MIPS R4x00 ARC Systems @@ -8,6 +8,18 @@ include "arch/arc/conf/std.arc" maxusers 4 # estimated number of users +# Platform support +options PLATFORM_ACER_PICA_61 # Pica, NEC ImageRISCstation +options PLATFORM_DESKTECH_ARCSTATION_I # DESKstation rPC44 +options PLATFORM_DESKTECH_TYNE # DESKstation Tyne +options PLATFORM_MICROSOFT_JAZZ # MIPS Magnum +options PLATFORM_NEC_JC94 # NEC Express 5800/230 PCI R4K +options PLATFORM_NEC_R94 # NEC RISCstation 2200 EISA +options PLATFORM_NEC_R96 # NEC Express RISCserver, RISCserver 2200 +options PLATFORM_NEC_RAX94 # NEC RISCstation 2200 PCI +options PLATFORM_NEC_RD94 # NEC RISCstation 2250 +options PLATFORM_SNI_RM200PCI + # Enable the hooks used for initializing the root memory-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk @@ -127,8 +139,17 @@ cpu* at mainbus0 #### Jazz-Internal bus devices -jazzio* at mainbus0 # Jazz-Internal bus. -aclock0 at jazzio? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 +jazzio* at mainbus0 # Jazz-Internal bus host bridge. + +timer0 at jazzio? +mcclock0 at jazzio? #pc0 at jazzio? #opms0 at jazzio? vga0 at jazzio? # Jazz localbus VGA @@ -154,13 +175,27 @@ scsibus* at osiop? #### ISA bus devices -isabr* at mainbus0 # ISA Bus bridge (std ISA bus). -isa* at isabr? +# PLATFORM_ACER_PICA_61 +# PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_R94 +# PLATFORM_NEC_R96 +jazzisabr* at mainbus0 # Jazz-(E)ISA bus bridge. +isa* at jazzisabr? + +# PLATFORM_DESKTECH_ARCSTATION_I +arcsisabr* at mainbus0 # DESKstation rPC44 ISA host bridge. +isa* at arcsisabr? + +# PLATFORM_DESKTECH_TYNE +tyneisabr* at mainbus0 # DESKstation Tyne ISA host bridge. +isa* at tyneisabr? + #isadma0 at isa? -aclock0 at isa? port 0x70 irq 0 +timer0 at isa? port 0x40 irq 0 +mcclock0 at isa? port 0x70 -pc0 at isa? port 0x60 irq 1 # generic PC console device +pc0 at isa? irq 1 # generic PC console device #vga0 at isa? #pckbc0 at isa? # PC keyboard controller com0 at isa? port 0x3f8 irq 4 @@ -218,28 +253,24 @@ lpt0 at isa? port 0x378 irq 7 #btl0 at isa? port 0x330 irq ? drq ? #scsibus* at btl? -#### Algor bus devices - -#algor* at mainbus0 # Algorithmics local bus. - -#aclock0 at algor? -#com0 at algor? -#com1 at algor? -#lpt0 at algor? - #### PCI bus devices +# PLATFORM_NEC_JC94 +# PLATFORM_NEC_RAX94 +# PLATFORM_NEC_RD94 necpb* at mainbus0 # NEC RISCstation PCI host bridge. pci* at necpb? -#pbcpcibr* at mainbus0 # Algorithmics PCI bus bridge. -#pci* at pbcpcibr? - #pcivga* at pci? dev ? function ? -#siop* at pci? dev ? function ? -#scsibus* at siop? -#de* at pci? dev ? function ? +tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics +ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI +scsibus* at ahc? + +#siop* at pci? dev ? function ? # NCR/Symbios 53c8xx SCSI +#scsibus* at siop? + +#de* at pci? dev ? function ? ex* at pci? dev ? function ? # 3Com 90x[B] fxp* at pci? dev ? function ? # Intel EtherExpress PRO le* at pci? dev ? function ? # PCnet-PCI @@ -259,9 +290,20 @@ pciide* at pci ? dev ? function ? flags 0x0000 wd* at pciide? channel ? drive ? flags 0x0000 atapibus* at pciide? channel ? -tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI -scsibus* at ahc? +#### MII/PHY support + +exphy* at mii? phy ? # 3Com internal PHYs +icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890 +inphy* at mii? phy ? # Intel 82555 PHYs +iophy* at mii? phy ? # Intel 82553 PHYs +lxtphy* at mii? phy ? # Level One LXT-970 PHYs +nsphy* at mii? phy ? # NS83840 PHYs +nsphyter* at mii? phy ? # NS83843 PHYs +qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs +sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs +tlphy* at mii? phy ? # ThunderLAN PHYs +tqphy* at mii? phy ? # TDK Semiconductor PHYs +ukphy* at mii? phy ? # generic unknown PHYs #### SCSI bus devices @@ -282,7 +324,7 @@ uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown #### Workstation Console attachments wsdisplay* at vga? -#wsdisplay* at tga? +wsdisplay* at tga? pckbd* at pckbc? # PC keyboard (kbd port) wskbd* at pckbd? pms* at pckbc? # PS/2-style mouse (aux port) diff --git a/sys/arch/arc/conf/files.arc b/sys/arch/arc/conf/files.arc index 9d262fdec7dd..682bf0b669b0 100644 --- a/sys/arch/arc/conf/files.arc +++ b/sys/arch/arc/conf/files.arc @@ -1,4 +1,4 @@ -# $NetBSD: files.arc,v 1.31 2001/06/08 04:48:56 simonb Exp $ +# $NetBSD: files.arc,v 1.32 2001/06/13 15:37:28 soda Exp $ # $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $ # # maxpartitions must be first item in files.${ARCH} @@ -7,13 +7,66 @@ maxpartitions 16 maxusers 2 8 64 -# Required files +## +## Platform support option header and files +## + +defopt opt_platform.h PLATFORM_ACER_PICA_61 + PLATFORM_DESKTECH_ARCSTATION_I + PLATFORM_DESKTECH_TYNE + PLATFORM_MICROSOFT_JAZZ + PLATFORM_NEC_JC94 + PLATFORM_NEC_R94 + PLATFORM_NEC_R96 + PLATFORM_NEC_RAX94 + PLATFORM_NEC_RD94 + PLATFORM_SNI_RM200PCI + +file arch/arc/arc/c_isa.c platform_desktech_arcstation_i | + platform_desktech_tyne +file arch/arc/arc/c_jazz_eisa.c platform_acer_pica_61 | + platform_microsoft_jazz | + platform_nec_r94 | + platform_nec_r96 +file arch/arc/arc/c_magnum.c platform_acer_pica_61 | + platform_microsoft_jazz +file arch/arc/arc/c_nec_eisa.c platform_nec_r94 | + platform_nec_r96 +file arch/arc/arc/c_nec_jazz.c platform_nec_r94 | + platform_nec_r96 | + platform_nec_jc94 | + platform_nec_rax94 | + platform_nec_rd94 +file arch/arc/arc/c_nec_pci.c platform_nec_jc94 | + platform_nec_rax94 | + platform_nec_rd94 + +file arch/arc/arc/p_acer_pica_61.c platform_acer_pica_61 +file arch/arc/arc/p_dti_arcstation.c platform_desktech_arcstation_i +file arch/arc/arc/p_dti_tyne.c platform_desktech_tyne +file arch/arc/arc/p_ms_jazz.c platform_microsoft_jazz +file arch/arc/arc/p_nec_jc94.c platform_nec_jc94 +file arch/arc/arc/p_nec_r94.c platform_nec_r94 +file arch/arc/arc/p_nec_r96.c platform_nec_r96 +file arch/arc/arc/p_nec_rax94.c platform_nec_rax94 +file arch/arc/arc/p_nec_rd94.c platform_nec_rd94 +file arch/arc/arc/p_sni_rm200pci.c platform_sni_rm200pci + +file arch/arc/arc/platconf.c +file arch/arc/arc/platform.c + +## +## Required files +## file arch/arc/arc/autoconf.c file arch/arc/arc/conf.c file arch/arc/arc/disksubr.c file arch/arc/arc/machdep.c #file arch/arc/arc/minidebug.c +file arch/arc/arc/timer.c +file arch/arc/arc/todclock.c +file dev/clock_subr.c file arch/arc/arc/arc_trap.c file arch/arc/arc/bus_space.c file arch/arc/arc/bus_space_sparse.c @@ -63,27 +116,24 @@ file arch/arc/jazz/dma.c # XXX jazzio file arch/arc/jazz/jazzdmatlb.c # XXX jazzio file arch/arc/jazz/bus_dma_jazz.c # XXX jazzio -# -# ALGOR bus autoconfiguration devices -# -device algor {} -attach algor at mainbus # optional -file arch/arc/algor/algorbus.c algor - # # ISA Bus bridge # -device isabr {} : isabus -attach isabr at mainbus # optional +define isabr file arch/arc/isa/isabus.c isabr -file arch/arc/isa/isadma_bounce.c # XXX DESKSTATION_RPC44 -# -# PCI Bus bridge -# -device pbcpcibr {} : pcibus -attach pbcpcibr at mainbus # optional -file arch/arc/pci/pbcpcibus.c pbcpcibr +device jazzisabr {} : isabus, isabr +attach jazzisabr at mainbus +file arch/arc/jazz/jazzisabr.c jazzisabr + +device arcsisabr {} : isabus, isabr # PLATFORM_DESKTECH_ARCSTATION_I +attach arcsisabr at mainbus +file arch/arc/isa/arcsisabr.c arcsisabr +file arch/arc/isa/isadma_bounce.c arcsisabr + +device tyneisabr {} : isabus, isabr # PLATFORM_DESKTECH_TYNE +attach tyneisabr at mainbus +file arch/arc/dti/tyneisabr.c tyneisabr # # NEC RISCstation PCI host bridge @@ -115,7 +165,7 @@ major {cd = 3} # Symbios 53C94 SCSI interface driver on Jazz-Internal bus device asc: scsi attach asc at jazzio -file arch/arc/jazz/asc.c asc +file arch/arc/jazz/asc.c asc needs-flag # Symbios 53C710 SCSI interface driver on Jazz-Internal bus attach osiop at jazzio with osiop_jazzio @@ -156,35 +206,48 @@ define pcmcia {} # XXX dummy decl... include "dev/pci/files.pci" include "dev/isa/files.isa" +# Interval timer, must have one.. +device timer +attach timer at jazzio with timer_jazzio +attach timer at isa with timer_isa +file arch/arc/jazz/timer_jazzio.c timer & timer_jazzio needs-flag +file arch/arc/isa/timer_isa.c timer & timer_isa needs-flag + # Real time clock, must have one.. -device aclock -attach aclock at jazzio with aclock_jazzio -attach aclock at isa with aclock_isa -attach aclock at algor with aclock_algor -file arch/arc/arc/clock.c aclock needs-flag -file arch/arc/arc/clock_mc.c aclock needs-flag -file arch/arc/jazz/clock_jazzio.c aclock & aclock_jazzio needs-flag +device mcclock +attach mcclock at jazzio with mcclock_jazzio +attach mcclock at isa with mcclock_isa +file arch/arc/dev/mcclock.c mcclock needs-flag +file arch/arc/jazz/mcclock_jazzio.c mcclock & mcclock_jazzio needs-flag +file arch/arc/isa/mcclock_isa.c mcclock & mcclock_isa needs-flag # Console driver on PC-style graphics device pc: tty +file arch/arc/dev/pccons.c (pc | opms) & + (pc_jazzio | pc_isa | + opms_jazzio | opms_isa) needs-flag attach pc at jazzio with pc_jazzio +file arch/arc/jazz/pccons_jazzio.c pc_jazzio | opms_jazzio attach pc at isa with pc_isa +file arch/arc/isa/pccons_isa.c pc_isa + +# PS/2-style mouse device opms: tty -attach opms at jazzio -file arch/arc/dev/pccons.c pc & (pc_jazzio | pc_isa | opms) needs-flag +file arch/arc/dev/opms.c opms +attach opms at jazzio with opms_jazzio +file arch/arc/jazz/opms_jazzio.c opms_jazzio +attach opms at isa with opms_isa +file arch/arc/isa/opms_isa.c opms_isa # BusLogic BT-445C VLB SCSI Controller. Special on TYNE local bus. device btl: scsi attach btl at isa -file arch/arc/dti/btl.c btl +file arch/arc/dti/btl.c btl needs-flag # NS16450/16550 Serial line driver attach com at jazzio with com_jazzio file arch/arc/jazz/com_jazzio.c com & com_jazzio -attach com at algor with com_algor -file arch/arc/algor/com_algor.c com & com_algor - # Game adapter (joystick) device joy attach joy at isa @@ -203,9 +266,6 @@ file arch/arc/isa/joy.c joy needs-flag attach lpt at jazzio with lpt_jazzio file arch/arc/jazz/lpt_jazzio.c lpt & lpt_jazzio -attach lpt at algor with lpt_algor -file arch/arc/algor/lpt_algor.c lpt & lpt_algor - # # PCI Bus support