Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/ofppc/conf Change this to include GENERIC and add o...



details:   https://anonhg.NetBSD.org/src/rev/de23696eab89
branches:  trunk
changeset: 773616:de23696eab89
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 09 19:04:04 2012 +0000

description:
Change this to include GENERIC and add options MULTIPROCESSOR.
(old GENERIC.MP was woefully out-of-date)

diffstat:

 sys/arch/ofppc/conf/GENERIC.MP |  429 +----------------------------------------
 1 files changed, 3 insertions(+), 426 deletions(-)

diffs (truncated from 444 to 300 lines):

diff -r 5329c03e856b -r de23696eab89 sys/arch/ofppc/conf/GENERIC.MP
--- a/sys/arch/ofppc/conf/GENERIC.MP    Thu Feb 09 18:58:44 2012 +0000
+++ b/sys/arch/ofppc/conf/GENERIC.MP    Thu Feb 09 19:04:04 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.MP,v 1.17 2011/12/18 05:49:31 dholland Exp $
+# $NetBSD: GENERIC.MP,v 1.18 2012/02/09 19:04:04 matt Exp $
 #
 # GENERIC machine description file
 # 
@@ -18,432 +18,9 @@
 # of each device driver in this file see the section 4 man page for the
 # device.
 
-include        "arch/ofppc/conf/std.ofppc"
-
-options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
-
-#ident                 "GENERIC-$Revision: 1.17 $"
-
-maxusers       32
-
-options        PIC_OPENPIC
-options        PIC_DISTOPENPIC
-options        PIC_I8259
-#options       PIC_PREPIVR
+include        "arch/ofppc/conf/GENERIC"
 
 # SMP options
 options        MULTIPROCESSOR
 options        IPI_OPENPIC
-options                PMAP_NEED_FULL_MAPKERNEL
-
-# various hacks due to bugs in Openfirmware implementation
-options        FIRMWORKSBUGS
-
-# Standard system options
-options        INSECURE        # disable kernel security checks
-#options       NTP             # NTP phase/frequency locked loop
-options        KTRACE          # system call tracing via ktrace(1)
-
-options        SYSVMSG         # System V message queues
-options        SYSVSEM         # System V semaphores
-options        SYSVSHM         # System V shared memory
-options        P1003_1B_SEMAPHORE # p1003.1b semaphore support
-
-
-options        USERCONF        # userconf(4) support
-#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
-options        RDB_PART        # Rigid Disk Block partition support
-
-# 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        DDB_HISTORY_SIZE=512    # enable history editing in DDB
-options        DDB_VERBOSE_HELP
-options        TRAP_PANICWAIT
-
-makeoptions    DEBUG="-g"      # compile full symbol table
-
-# Compatibility option
-options        COMPAT_09       # NetBSD 0.9,
-options        COMPAT_10       # NetBSD 1.0,
-options        COMPAT_11       # NetBSD 1.1,
-options        COMPAT_12       # NetBSD 1.2,
-options        COMPAT_13       # NetBSD 1.3,
-options        COMPAT_14       # NetBSD 1.4,
-options        COMPAT_15       # NetBSD 1.5,
-options        COMPAT_16       # NetBSD 1.6,
-options        COMPAT_20       # NetBSD 2.0,
-options        COMPAT_30       # NetBSD 3.0 compatibility.
-options        COMPAT_40       # NetBSD 4.0 compatibility.
-options        COMPAT_50       # NetBSD 5.0 compatibility.
-options        COMPAT_43       # and 4.3BSD
-options        COMPAT_386BSD_MBRPART # recognize old partition ID
-#options       COMPAT_LINUX    # Linux binary compatibility
-#options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
-options        COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
-
-# 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
-file-system    MSDOSFS         # MS-DOS file system
-file-system    ADOSFS          # AmigaDOS file system
-file-system    FDESC           # /dev/fd
-file-system    KERNFS          # /kern
-file-system    NULLFS          # loopback file system
-file-system    OVERLAY         # overlay file system
-file-system    PUFFS           # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system    PROCFS          # /proc
-file-system    UMAPFS          # NULLFS + uid and gid remapping
-file-system    UNION           # union file system
-file-system    NTFS            # Windows NT file system
-file-system    PTYFS           # /dev/pts/N support
-file-system    TMPFS           # Efficient memory file-system
-#file-system   UDF             # experimental - OSTA UDF CD/DVD file-system
-
-# File system options
-options        QUOTA           # legacy UFS quotas
-options        QUOTA2          # new, in-filesystem UFS quotas
-options        FFS_EI          # FFS Endian Independent support
-options        WAPBL           # File system journaling support
-#options       UFS_DIRHASH     # UFS Large Directory Hashing - Experimental
-options        NFSSERVER       # Network File System server
-#options       FFS_NO_SNAPSHOT # No FFS snapshot support
-#options       EXT2FS_SYSTEM_FLAGS     # makes ext2fs file flags (append and
-                                       # immutable) behave as system flags.
-
-options        NFS_BOOT_DHCP   # Support DHCP NFS root
-
-# Networking options
-#options       GATEWAY         # packet forwarding
-options        INET            # IP + ICMP + TCP + UDP
-options        INET6           # IPV6
-#options       IPSEC           # IP security
-#options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
-#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
-#options       IPSEC_DEBUG     # debug for IP security
-#options       MROUTING        # IP multicast routing
-#options       PIM             # Protocol Independent Multicast
-#options       ISO,TPIP        # OSI
-#options       EON             # OSI tunneling over IP
-#options       NETATALK        # AppleTalk networking protocols
-options        PPP_BSDCOMP     # BSD-Compress compression support for PPP
-options        PPP_DEFLATE     # Deflate compression support for PPP
-options        PPP_FILTER      # Active filter support for PPP (requires BPF)
-options        PFIL_HOOKS      # pfil(9) packet filter hooks
-options        IPFILTER_LOG    # ipmon(8) log support
-options        IPFILTER_LOOKUP # ippool(8) support
-options        IPFILTER_COMPAT # Compat for IP-Filter
-#options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
-#options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
-
-#options       ALTQ            # Manipulate network interfaces' output queues
-#options       ALTQ_BLUE       # Stochastic Fair Blue
-#options       ALTQ_CBQ        # Class-Based Queueing
-#options       ALTQ_CDNR       # Diffserv Traffic Conditioner
-#options       ALTQ_FIFOQ      # First-In First-Out Queue
-#options       ALTQ_FLOWVALVE  # RED/flow-valve (red-penalty-box)
-#options       ALTQ_HFSC       # Hierarchical Fair Service Curve
-#options       ALTQ_LOCALQ     # Local queueing discipline
-#options       ALTQ_PRIQ       # Priority Queueing
-#options       ALTQ_RED        # Random Early Detection
-#options       ALTQ_RIO        # RED with IN/OUT
-#options       ALTQ_WFQ        # Weighted Fair Queueing
-
-# These options enable verbose messages for several subsystems.
-# Warning, these may compile large string tables into the kernel!
-options        MIIVERBOSE      # verbose PHY autoconfig messages
-options        PCIVERBOSE      # verbose PCI device autoconfig messages
-#options       PCI_CONFIG_DUMP # verbosely dump PCI config space
-options        SCSIVERBOSE     # human readable SCSI error messages
-options        USBVERBOSE      # verbose USB device autoconfig messages
-
-options        WSEMUL_VT100
-options        WS_DEFAULT_FG=WSCOL_BLACK
-options        WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options        WS_KERNEL_FG=WSCOL_GREEN
-options        WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-#options       FONT_GALLANT12x22
-options        FONT_BOLD8x16
-
-# Kernel root file system and dump configuration
-config         netbsd  root on ? type ?
-
-#
-# Device configuration
-#
-
-mainbus*       at root
-
-# CPUs
-cpu*           at mainbus?
-
-# Generic OpenFirmware console support
-rtas*          at mainbus?
-
-# PCI root nodes
-ofwpci*                at mainbus?
-pci*           at ofwpci? bus ?
-pegasospci*    at mainbus?
-pci*           at pegasospci? bus ?
-
-# PCI bridges
-pchb*          at pci? dev ? function ?
-ppb*           at pci? dev ? function ?
-pcib*          at pci? dev ? function ?
-
-# ISA bus support
-isa*           at pcib?
-
-# Console Devices
-genfb*         at pci? dev ? function ?
-#radeonfb*     at pci? dev ? function ?
-pckbc0         at isa?                 # pc keyboard controller
-pckbd*         at pckbc?               # PC keyboard
-pms*           at pckbc?               # PS/2 mouse for wsmouse
-#wscons stuff
-wskbd*         at pckbd? console ?
-wsmouse*       at pms? mux 0
-# make sure the console display is always wsdisplay0 XXX Why?
-wsdisplay0      at wsemuldisplaydev? console 1
-wsdisplay*      at wsemuldisplaydev?
-
-attimer0       at isa?                 # AT Timer
-pcppi0         at isa?                 # PC prog. periph. interface
-# FIX ISABEEP LATER
-
-# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
-viaenv*        at pci? dev ? function ?
-
-# Serial Devices
-# ISA serial interfaces
-com0   at isa? port 0x3f8 irq 4        # standard PC serial ports
-com1   at isa? port 0x2f8 irq 3
-
-# Parallel Printer Interfaces
-# ISA parallel printer interfaces
-lpt0           at isa? port 0x3bc irq 7        # standard PC parallel ports
-
-# SCSI Controllers and Devices
-siop*          at pci? dev ? function ?        # Symbios 53c8xx SCSI
-esiop*         at pci? dev ? function ?        # Symbios 53c875 SCSI and newer
-
-# SCSI bus support
-scsibus*       at siop?
-scsibus*       at esiop?
-scsibus*       at umass?
-
-# SCSI devices
-sd*            at scsibus? target ? lun ?      # SCSI disk drives
-st*            at scsibus? target ? lun ?      # SCSI tape drives
-cd*            at scsibus? target ? lun ?      # SCSI CD-ROM drives
-#ch*           at scsibus? target ? lun ?      # SCSI autochangers
-#ss*           at scsibus? target ? lun ?      # SCSI scanners
-#uk*           at scsibus? target ? lun ?      # SCSI unknown
-
-# IDE and related devices
-# PCI IDE controllers
-pciide*                at pci? dev ? function ? flags 0x0000
-viaide*                at pci? dev ? function ?        # VIA/AMD/Nvidia IDE controllers
-
-# ATA (IDE) bus support
-atabus*                at ata?
-
-# IDE drives
-# Flags are used only with controllers that support DMA operations
-# and mode settings (e.g. some pciide controllers)
-# The lowest order four bits (rightmost digit) of the flags define the PIO
-# mode to use, the next set of four bits the DMA mode and the third set the
-# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
-# to use, and the last bit must be 1 for this setting to be used.
-# For DMA and UDMA, 0xf (1111) means 'disable'.
-# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
-# (0xc=1100, 0xa=1010, 0xf=1111)
-# 0x0000 means "use whatever the drive claims to support".
-wd*    at atabus? drive ? flags 0x0000
-
-# ATAPI bus support
-atapibus*      at atapi?
-
-# ATAPI devices
-# flags have the same meaning as for IDE drives.
-cd*    at atapibus? drive ? flags 0x0000       # ATAPI CD-ROM drives
-sd*    at atapibus? drive ? flags 0x0000       # ATAPI disk drives
-uk*    at atapibus? drive ? flags 0x0000       # ATAPI unknown
-
-# Network Interfaces
-ep*    at pci? dev ? function ?        # 3Com 3c59x
-ex*    at pci? dev ? function ?        # 3Com 3c90x[BC]
-fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
-ne*    at pci? dev ? function ?        # NE2000-compatible Ethernet
-pcn*   at pci? dev ? function ?        # AMD PCnet-PCI Ethernet
-re*    at pci? dev ? function ?        # Realtek 8139C+/8169/8169S/8110S
-rtk*   at pci? dev ? function ?        # Realtek 8129/8139
-sip*   at pci? dev ? function ?        # SiS 900/DP83815 Ethernet
-tlp*   at pci? dev ? function ?        # DECchip 21x4x and clones
-vr*    at pci? dev ? function ?        # VIA Rhine Fast Ethernet
-
-# MII/PHY support
-acphy* at mii? phy ?                   # Altima AC101 and AMD Am79c874 PHYs
-amhphy* at mii? phy ?                  # AMD 79c901 Ethernet PHYs
-bmtphy* at mii? phy ?                  # Broadcom BCM5201 and BCM5202 PHYs
-brgphy* at mii? phy ?                  # Broadcom BCM5400-family PHYs
-ciphy* at mii? phy ?                   # Cicada CS8201 Gig-E PHYs
-dmphy* at mii? phy ?                   # Davicom DM9101 PHYs
-exphy* at mii? phy ?                   # 3Com internal PHYs
-gentbi* at mii? phy ?                  # Generic Ten-Bit 1000BASE-[CLS]X PHYs
-glxtphy* at mii? phy ?                 # Level One LXT-1000 PHYs
-gphyter* at mii? phy ?                 # NS83861 Gig-E PHY
-icsphy* at mii? phy ?                  # Integrated Circuit Systems ICS189x
-igphy* at mii? phy ?                   # Intel IGP01E1000
-ikphy* at mii? phy ?                   # Intel 82563 PHYs
-inphy* at mii? phy ?                   # Intel 82555 PHYs



Home | Main Index | Thread Index | Old Index