Source-Changes-HG archive

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

[src/netbsd-3]: src/sys/arch/amd64/conf Pull up following revision(s) (reques...



details:   https://anonhg.NetBSD.org/src/rev/c948039d258a
branches:  netbsd-3
changeset: 577523:c948039d258a
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Nov 21 20:44:25 2005 +0000

description:
Pull up following revision(s) (requested by dsl in ticket #977):
        sys/arch/amd64/conf/INSTALL_ACPI: revision 1.29 via patch
include "INSTALL" then modify it - so we get the same device

diffstat:

 sys/arch/amd64/conf/INSTALL_ACPI |  645 +--------------------------------------
 1 files changed, 6 insertions(+), 639 deletions(-)

diffs (truncated from 652 to 300 lines):

diff -r ae8f48fbb6e1 -r c948039d258a sys/arch/amd64/conf/INSTALL_ACPI
--- a/sys/arch/amd64/conf/INSTALL_ACPI  Mon Nov 21 20:42:02 2005 +0000
+++ b/sys/arch/amd64/conf/INSTALL_ACPI  Mon Nov 21 20:44:25 2005 +0000
@@ -1,642 +1,9 @@
-# $NetBSD: INSTALL_ACPI,v 1.18.4.4 2005/07/18 21:14:32 riz Exp $
-#
-# GENERIC machine description file
-# 
-# This machine description file is used to generate the default NetBSD
-# kernel.  The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
-#
-# For further information on compiling NetBSD kernels, see the config(8)
-# man page.
-#
-# For further information on hardware support for this architecture, see
-# the intro(4) man page.  For further information about kernel options
-# for this architecture, see the options(4) man page.  For an explanation
-# of each device driver in this file see the section 4 man page for the
-# device.
-
-include        "arch/amd64/conf/std.amd64"
-
-#ident                 "INSTALL-$Revision: 1.18.4.4 $"
-
-maxusers       32              # estimated number of users
-
-# Standard system options
-
-makeoptions    COPTS="-Os"
-
-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=4992      # size of memory disk, in blocks
-
-options        INSECURE        # disable kernel security levels - X needs this
-
-options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
-
-#options       SYSVMSG         # System V-like message queues
-#options       SYSVSEM         # System V-like semaphores
-#options       SEMMNI=10       # number of semaphore identifiers
-#options       SEMMNS=60       # number of semaphores in system
-#options       SEMUME=10       # max number of undo entries per process
-#options       SEMMNU=30       # number of undo structures in system
-#options       SYSVSHM         # System V-like memory sharing
-#options       SHMMAXPGS=2048  # 2048 pages is the default
-
-#options       LKM             # loadable kernel modules
-
-options        USERCONF        # userconf(4) support
-#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
-# Enable experimental buffer queue strategy for better responsiveness under 
-# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options       NEW_BUFQ_STRATEGY
-
-# Diagnostic/debugging support options
-#options       DIAGNOSTIC      # expensive kernel consistency checks
-#options       DEBUG           # expensive debugging checks/support
-#options       DDB             # in-kernel debugger
-#options       DDB_HISTORY_SIZE=512    # enable history editing in DDB
-#options       KGDB            # remote debugger
-#options       KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions   DEBUG="-g"      # compile full symbol table
-
-#options       COMPAT_NETBSD32
-options        EXEC_ELF32
-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    NTFS            # Windows/NT file system (experimental)
-file-system    CD9660          # ISO 9660 + Rock Ridge file system
-file-system    MSDOSFS         # MS-DOS 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   PORTAL          # portal filesystem (still experimental)
-#file-system   PROCFS          # /proc
-#file-system   UMAPFS          # NULLFS + uid and gid remapping
-#file-system   UNION           # union file system
-
-# File system options
-#options       QUOTA           # UFS quotas
-#options       FFS_EI          # FFS Endian Independent support
-#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.
-#options       FFS_NO_SNAPSHOT # ffs snapshots
-
-# 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       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
-
-# 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       PCMCIAVERBOSE   # verbose PCMCIA configuration messages
-#options       SCSIVERBOSE     # human readable SCSI error messages
-#options       USBVERBOSE      # verbose USB device autoconfig messages
-#options       I2OVERBOSE      # verbose I2O driver messages
-
-options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
-
-#
-# wscons options
+# $NetBSD: INSTALL_ACPI,v 1.18.4.5 2005/11/21 20:44:25 tron Exp $
 #
-# builtin terminal emulations
-#options       WSEMUL_SUN              # sun terminal emulation
-options        WSEMUL_VT100            # VT100 / VT220 emulation
-# different kernel output - see dev/wscons/wsdisplayvar.h
-options        WS_KERNEL_FG=WSCOL_GREEN
-#options       WS_KERNEL_BG=WSCOL_BLACK
-# compatibility to other console drivers
-#options       WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
-#options       WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
-#options       WSDISPLAY_COMPAT_USL            # VT handling
-#options       WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
-# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
-#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
-# allocate a number of virtual screens at autoconfiguration time
-#options       WSDISPLAY_DEFAULTSCREENS=4
-# use a large software cursor that doesn't blink
-options        PCDISPLAY_SOFTCURSOR
-# modify the screen type of the console; defaults to "80x25"
-#options       VGA_CONSOLE_SCREENTYPE="\"80x24\""
-# work around a hardware bug that loaded fonts don't work; found on ATI cards
-#options       VGA_CONSOLE_ATI_BROKEN_FONTSEL
-# the following enables some functions to get mouse console support.
-# if you want a really secure system, it may be better not to enable them,
-# see wsmoused(8), section SECURITY CONSIDERATIONS for more info.
-#options       WSDISPLAY_CHARFUNCS             # mouse console support
-# enable VGA raster mode capable of displaying multilingual text on console
-#options       VGA_RASTERCONSOLE
-
-# Kernel root file system and dump configuration.
-config         netbsd  root on ? type ?
-#config                netbsd  root on sd0a type ffs
-#config                netbsd  root on ? type nfs
-
-#
-# Device configuration
-#
-
-mainbus0 at root
-
-options        MPACPI
-options MPBIOS
-acpi0  at mainbus0
-cpu*   at mainbus0
-ioapic* at mainbus0
-
-#apm0  at mainbus0                     # Advanced power management
-
-# Tuning for power management, see apm(4) for more details.
-#options       APM_NO_IDLE             # Don't call BIOS CPU idle function
-#options       APM_V10_ONLY            # Use only the APM 1.0 calls
-#options       APM_NO_POWEROFF         # Don't power off on halt(8)
-#options       APM_POWER_PRINT         # Print stats on the console
-#options       APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
-
-
-# Basic Bus Support
-
-# PCI bus support
-pci*   at mainbus? bus ?
-pci*   at pchb? bus ?
-pci*   at ppb? bus ?
-
-# PCI bridges
-pchb*  at pci? dev ? function ?        # PCI-Host bridges
-pcib*  at pci? dev ? function ?        # PCI-ISA bridges
-ppb*   at pci? dev ? function ?        # PCI-PCI bridges
-# XXX 'puc's aren't really bridges, but there's no better place for them here
-puc*   at pci? dev ? function ?        # PCI "universal" comm. cards
-
-aapic*         at pci? dev ? function ?        # AMD 8131 IO apic
-
-#agp*  at pchb?
-
-#
-
-# ISA bus support
-isa0   at mainbus?
-isa0   at pcib?
-
-# CardBus bridge support
-#cbb*          at pci? dev ? function ?
-#cardslot*     at cbb?
-
-# CardBus bus support
-#cardbus*      at cardslot?
-#pcmcia*       at cardslot?
-
-# Coprocessor Support
-
-# Console Devices
-
-# wscons
-pckbc0         at isa?                 # pc keyboard controller
-pckbd*         at pckbc?               # PC keyboard
-pms*           at pckbc?               # PS/2 mouse for wsmouse
-#options       PMS_DISABLE_POWERHOOK   # Disable PS/2 reset on resume
-#options       PMS_SYNAPTICS_TOUCHPAD  # Enable support for Synaptics Touchpads
-vga*           at pci? dev ? function ?
-wsdisplay*     at vga? console ?
-wskbd*         at pckbd? console ?
-wsmouse*       at pms? mux 0
-
-pcppi0         at isa?
-sysbeep0       at pcppi?
-
-# Serial Devices
-
-# PCI serial interfaces
-com*   at puc? port ?                  # 16x50s on "universal" comm boards
-cy*    at pci? dev ? function ?        # Cyclades Cyclom-Y serial boards
-cz*    at pci? dev ? function ?        # Cyclades-Z multi-port serial boards
-
-# PCMCIA serial interfaces
-#com*  at pcmcia? function ?           # Modems and serial cards
-
-#pcmcom*       at pcmcia? function ?           # PCMCIA multi-port serial cards
-#com*  at pcmcom? slave ?              # ...and the slave devices
-
-# CardBus serial interfaces
-#com*  at cardbus? dev ? function ?    # Modems and serial cards
-
-# ISA serial interfaces
-#options       COM_HAYESP              # adds Hayes ESP serial board support
-com0   at isa? port 0x3f8 irq 4        # Standard PC serial ports
-com1   at isa? port 0x2f8 irq 3
-
-# Parallel Printer Interfaces
-
-# PCI parallel printer interfaces
-#lpt*  at puc? port ?                  # || ports on "universal" comm boards
-
-# ISA parallel printer interfaces
-#lpt0  at isa? port 0x378 irq 7        # standard PC parallel ports
-#lpt1  at isa? port 0x278
-
-# Hardware monitors
-
-# LM7[89] and compatible hardware monitors
-#lm0   at isa? port 0x290              # other common ports: 0x280, 0x310
-
-# I2O devices
-iop*   at pci? dev ? function ?        # I/O processor
-iopsp* at iop? tid ?                   # SCSI/FC-AL ports
-ld*    at iop? tid ?                   # block devices
-# XXX dpti.c wants a processor type that is not assigned for x86-64
-#dpti* at iop? tid 0                   # DPT/Adaptec control interface
-
-
-# SCSI Controllers and Devices
-
-# PCI SCSI controllers
-adv*   at pci? dev ? function ?        # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
-adw*   at pci? dev ? function ?        # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
-ahc*   at pci? dev ? function ?        # Adaptec [23]94x, aic78x0 SCSI
-bha*   at pci? dev ? function ?        # BusLogic 9xx SCSI
-dpt*   at pci? dev ? function ?        # DPT SmartCache/SmartRAID
-iha*   at pci? dev ? function ?        # Initio INIC-940/950 SCSI
-isp*   at pci? dev ? function ?        # Qlogic ISP [12]0x0 SCSI/FibreChannel
-mly*   at pci? dev ? function ?        # Mylex AcceleRAID and eXtremeRAID
-mpt*   at pci? dev ? function ?        # LSILogic 9x9 and 53c1030
-pcscp* at pci? dev ? function ?        # AMD 53c974 PCscsi-PCI SCSI
-siop*  at pci? dev ? function ?        # Symbios 53c8xx SCSI
-#options       SIOP_SYMLED             # drive the act. LED in software
-trm*   at pci? dev ? function ?        # Tekram DC-395U/UW/F, DC-315/U SCSI
-
-# PCMCIA SCSI controllers
-#aic*  at pcmcia? function ?           # Adaptec APA-1460 SCSI



Home | Main Index | Thread Index | Old Index