Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/kqueue]: src/sys/arch/mmeye/conf sync kqueue branch with -current - mmey...
details: https://anonhg.NetBSD.org/src/rev/cc3e862fccd9
branches: kqueue
changeset: 512496:cc3e862fccd9
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Mon Jul 08 22:53:55 2002 +0000
description:
sync kqueue branch with -current - mmeye now compiles for real
diffstat:
sys/arch/mmeye/conf/GENERIC | 6 +-
sys/arch/mmeye/conf/MMEYE | 17 +-
sys/arch/mmeye/conf/MMTA | 27 +---
sys/arch/mmeye/conf/MMTAICE | 32 +----
sys/arch/mmeye/conf/MMTANEW | 226 +----------------------------------------
sys/arch/mmeye/conf/MMTAROMNEW | 30 +---
6 files changed, 40 insertions(+), 298 deletions(-)
diffs (truncated from 527 to 300 lines):
diff -r edfdf52731fb -r cc3e862fccd9 sys/arch/mmeye/conf/GENERIC
--- a/sys/arch/mmeye/conf/GENERIC Fri Jun 28 08:23:37 2002 +0000
+++ b/sys/arch/mmeye/conf/GENERIC Mon Jul 08 22:53:55 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.24.2.5 2002/06/23 17:38:12 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.24.2.6 2002/07/08 22:53:55 jdolecek Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.24.2.5 $"
+#ident "GENERIC-$Revision: 1.24.2.6 $"
maxusers 16 # estimated number of users
@@ -66,7 +66,6 @@
#makeoptions DEBUG="-g" # compile full symbol table
# Compatibility options
-options COMPAT_13 # NetBSD 1.3
options COMPAT_14 # NetBSD 1.4,
options COMPAT_43 # and 4.3BSD
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
@@ -194,6 +193,7 @@
pseudo-device rnd # /dev/random and in-kernel generator
pseudo-device vcoda 4 # coda minicache <-> venus comm.
#pseudo-device md 1 # memory disk device (ramdisk)
+pseudo-device clockctl # user control of clock subsystem
# Enable the hooks used for initializing the root memory-disk.
#options MEMORY_DISK_HOOKS
diff -r edfdf52731fb -r cc3e862fccd9 sys/arch/mmeye/conf/MMEYE
--- a/sys/arch/mmeye/conf/MMEYE Fri Jun 28 08:23:37 2002 +0000
+++ b/sys/arch/mmeye/conf/MMEYE Mon Jul 08 22:53:55 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE,v 1.7.4.4 2002/06/23 17:38:12 jdolecek Exp $
+# $NetBSD: MMEYE,v 1.7.4.5 2002/07/08 22:53:55 jdolecek Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -38,7 +38,6 @@
#options SYSCALL_DEBUG
# Compatibility options
-options COMPAT_13 # NetBSD 1.3
options COMPAT_14 # NetBSD 1.4,
options COMPAT_43 # and 4.3BSD
@@ -72,18 +71,15 @@
shb* at mainbus?
-# WatchDog Timer
-wdog0 at shb? port 0xffffff84
-
-com0 at shb? port 0xa4000000 irq 11
-com1 at shb? port 0xa4000008 irq 12
+com0 at mainbus?
+com1 at mainbus?
# SH PCMCIA controllers
-shpcic0 at shb? port 0xb000000a iomem 0xb8000000 iosiz 0x1000000
-shpcic1 at shb? port 0xb000000c iomem 0xb9000000 iosiz 0x1000000
+mmeyepcmcia0 at mainbus?
+mmeyepcmcia1 at mainbus?
# PCMCIA bus support
-pcmcia* at shpcic? controller ? socket ?
+pcmcia* at mmeyepcmcia? controller ? socket ?
com* at pcmcia? function ? # Modems and serial cards
wdc* at pcmcia? function ?
@@ -99,6 +95,7 @@
#pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
pseudo-device pty # pseudo-terminals
+pseudo-device clockctl # user control of clock subsystem
# Enable the hooks used for initializing the root memory-disk.
#options MEMORY_DISK_HOOKS
diff -r edfdf52731fb -r cc3e862fccd9 sys/arch/mmeye/conf/MMTA
--- a/sys/arch/mmeye/conf/MMTA Fri Jun 28 08:23:37 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTA Mon Jul 08 22:53:55 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTA,v 1.7.2.4 2002/06/23 17:38:12 jdolecek Exp $
+# $NetBSD: MMTA,v 1.7.2.5 2002/07/08 22:53:55 jdolecek Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -50,7 +50,6 @@
options SYSCALL_DEBUG
# Compatibility options
-options COMPAT_13 # NetBSD 1.3
options COMPAT_43 # and 4.3BSD
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
@@ -117,27 +116,20 @@
shb* at mainbus?
-# Basic Bus Support
+com0 at mainbus?
+com1 at mainbus?
+
+# SH PCMCIA controllers
+mmeyepcmcia0 at mainbus?
+mmeyepcmcia1 at mainbus?
# PCMCIA bus support
-pcmcia* at shpcic? controller ? socket ?
-#pcmcia* at shb?
-
-# SH PCMCIA controllers
-shpcic0 at shb? port 0xb000000a iomem 0xb8000000 iosiz 0x1000000
-shpcic1 at shb? port 0xb000000c iomem 0xb9000000 iosiz 0x1000000
-
+pcmcia* at mmeyepcmcia? controller ? socket ?
# Console Devices
# XXX
-
-# Serial Devices
-
-com0 at shb? port 0xa4000000 irq 11
-com1 at shb? port 0xa4000008 irq 12
-
# PCMCIA serial interfaces
com* at pcmcia? function ? # Modems and serial cards
@@ -191,7 +183,7 @@
nsphy* at mii? phy ? # NS83840 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
-tlphy* at mii? phy ? # ThunderLAN PHYs
+#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
@@ -218,6 +210,7 @@
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
#pseudo-device tb 1 # tablet line discipline
+pseudo-device clockctl # user control of clock subsystem
# rnd is EXPERIMENTAL at this point.
#pseudo-device rnd # /dev/random and in-kernel generator
diff -r edfdf52731fb -r cc3e862fccd9 sys/arch/mmeye/conf/MMTAICE
--- a/sys/arch/mmeye/conf/MMTAICE Fri Jun 28 08:23:37 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTAICE Mon Jul 08 22:53:55 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAICE,v 1.6.2.4 2002/06/23 17:38:13 jdolecek Exp $
+# $NetBSD: MMTAICE,v 1.6.2.5 2002/07/08 22:53:56 jdolecek Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -81,7 +81,6 @@
options SYSCALL_DEBUG
# Compatibility options
-options COMPAT_13 # NetBSD 1.3
options COMPAT_43 # and 4.3BSD
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
@@ -147,29 +146,15 @@
shb* at mainbus?
-#apm0 at mainbus0 # Advanced power management
-
-
-# Basic Bus Support
-
-# PCMCIA bus support
-pcmcia* at shpcic? controller ? socket ?
-#pcmcia* at shb?
+com0 at mainbus?
+com1 at mainbus?
# SH PCMCIA controllers
-shpcic0 at shb? port 0xb000000a iomem 0xb8000000 iosiz 0x1000000
-shpcic1 at shb? port 0xb000000c iomem 0xb9000000 iosiz 0x1000000
-
-
-# Console Devices
+mmeyepcmcia0 at mainbus?
+mmeyepcmcia1 at mainbus?
-# XXX
-
-
-# Serial Devices
-
-com0 at shb? port 0xa4000000 irq 11
-com1 at shb? port 0xa4000008 irq 12
+# PCMCIA bus support
+pcmcia* at mmeyepcmcia? controller ? socket ?
# PCMCIA serial interfaces
com* at pcmcia? function ? # Modems and serial cards
@@ -224,7 +209,7 @@
nsphy* at mii? phy ? # NS83840 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
-tlphy* at mii? phy ? # ThunderLAN PHYs
+#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
@@ -251,6 +236,7 @@
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
#pseudo-device tb 1 # tablet line discipline
+pseudo-device clockctl # user control of clock subsystem
# rnd is EXPERIMENTAL at this point.
#pseudo-device rnd # /dev/random and in-kernel generator
diff -r edfdf52731fb -r cc3e862fccd9 sys/arch/mmeye/conf/MMTANEW
--- a/sys/arch/mmeye/conf/MMTANEW Fri Jun 28 08:23:37 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTANEW Mon Jul 08 22:53:55 2002 +0000
@@ -1,231 +1,9 @@
-# $NetBSD: MMTANEW,v 1.6.2.4 2002/06/23 17:38:13 jdolecek Exp $
-#
-# GENERIC -- everything that's currently supported
+# $NetBSD: MMTANEW,v 1.6.2.5 2002/07/08 22:53:56 jdolecek Exp $
#
-include "arch/mmeye/conf/std.mmeye"
-
-#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+include "arch/mmeye/conf/MMTA"
-# Enable the hooks used for initializing the root memory-disk.
-#options MEMORY_DISK_HOOKS
-#options MEMORY_DISK_IS_ROOT # force root on memory disk
-#options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-#options MEMORY_DISK_ROOT_SIZE=3074 # size of memory disk, in blocks
-
-maxusers 32 # estimated number of users
-
-# Standard system options
-options SH3
-options SH7708R # 100MHz
-options PCLOCK=33330000 # 33.33MHz
options MMEYE_NEW_INT
#options MMEYE_NO_CACHE
-options INITTODR_ALWAYS_USE_RTC
#options MATH_EMULATE # floating point emulation
-
-#options UCONSOLE # users can use TIOCCONS (for xconsole)
-options INSECURE # disable kernel security levels
-
-options RTC_OFFSET=-540 # hardware clock is this many mins. west of GMT
-options HZ=50 # clock interrupt generates every 1/HZ sec
-#options NTP # NTP phase/frequency locked loop
-
-#options KTRACE # system call tracing via ktrace(1)
-
-options SYSVMSG # System V-like message queues
-options SYSVSEM # System V-like semaphores
-options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
-#options LKM # loadable kernel modules
-
-#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
-# Diagnostic/debugging support options
-#options DIAGNOSTIC # cheap kernel consistency checks
-#options DEBUG # expensive debugging checks/support
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
-#options DDB # in-kernel debugger
-#options KGDB # remote debugger
-#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions DEBUG="-g" # compile full symbol table
-options SYSCALL_DEBUG
-
-# Compatibility options
-options COMPAT_13 # NetBSD 1.3
-options COMPAT_43 # and 4.3BSD
-#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-
-# Executable format options
-options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux)
-options EXEC_COFF # 32-bit COFF executables (sh-compiler)
-
-# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
Home |
Main Index |
Thread Index |
Old Index