Skip to content

Commit

Permalink
amd64: sync AMD64_GENERIC and platform/files with i386
Browse files Browse the repository at this point in the history 
Pull up most devices from GENERIC into AMD64_GENERIC.  I left out those
that don't compile, which are basically only isa-only network drivers.

Temporarilty use the generic crypto functions until assembler versions
are imported.
  • Loading branch information
@corecode
corecode committed Sep 15, 2009
1 parent 702a95c commit 503ce1e
Show file tree
Hide file tree
Showing 2 changed files with 223 additions and 35 deletions.
247 changes: 212 additions & 35 deletions sys/config/AMD64_GENERIC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ maxusers 0

makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols

#options MATH_EMULATE #Support for x87 emulation
options INET #InterNETworking
options INET6 #IPv6 communications protocols
options HAMMER #Hammer Filesystem
options FFS #Berkeley Fast Filesystem
options FFS_ROOT #FFS usable as root device [keep this!]
options SOFTUPDATES #Enable FFS soft updates support
Expand All @@ -30,24 +30,21 @@ options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_DF12 #Compatible with DragonFly 1.2 and earlier
options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
options DEVICE_POLLING # Support mixed interrupt-polling
# handling of network device drivers
options UCONSOLE #Allow users to grab the console
#options USERCONFIG #boot -c editor
#options VISUAL_USERCONFIG #visual boot -c editor
options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options P1003_1B #Posix P1003_1B real-time extensions
options _KPOSIX_PRIORITY_SCHEDULING
options ICMP_BANDLIM #Rate limit bad replies
#options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~128k to driver.
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.

# To make an SMP kernel both SMP and APIC_IO are usually
Expand All @@ -63,31 +60,33 @@ options DDB
options DDB_TRACE
options INVARIANTS

# ACPI options
#options ACPI_QUIRK_VMWARE # VMware's ACPI-fast24 timer is broken

device isa
#device eisa
#device pci
device pci

# AHCI driver, this will override NATA for AHCI devices,
# both drivers may be included.
#
device ahci

# Floppy drives
#device fdc0 at isa? port IO_FD1 irq 6 drq 2
#device fd0 at fdc0 drive 0
#device fd1 at fdc0 drive 1
# Sil3124/3132/3531 driver
#
# If you have a Toshiba Libretto with its Y-E Data PCMCIA floppy,
# don't use the above line for fdc0 but the following one:
#device fdc0
device sili

# NEW-ATA (NATA) and ATAPI devices
#
#device nata
#device natadisk # ATA disk drives
#device natapicd # ATAPI CDROM drives
#device natapifd # ATAPI floppy drives
#device natapist # ATAPI tape drives
#device natapicam # Emulate ATAPI devices as SCSI
#device nataraid # support for ATA software RAID
device nata
device natadisk # ATA disk drives
device natapicd # ATAPI CDROM drives
device natapifd # ATAPI floppy drives
device natapist # ATAPI tape drives
device natapicam # Emulate ATAPI devices as SCSI
device nataraid # support for ATA software RAID
# controllers
#device natausb # ATA-over-USB support
#options ATA_STATIC_ID # Static device numbering
device natausb # ATA-over-USB support
options ATA_STATIC_ID # Static device numbering

# LEGACY ATA and ATAPI devices
#device ata0 at isa? port IO_WD1 irq 14
Expand All @@ -100,15 +99,83 @@ device isa
#device atapicam # Emulate ATAPI devices as SCSI via CAM
#options ATA_STATIC_ID #Static device numbering

# SCSI Controllers
device ahb # EISA AHA1742 family
device ahc # AHA2940 and onboard AIC7xxx devices
device ahd # AHA39320/29320 and onboard AIC79xx devices
device amd # AMD 53C974 (Tekram DC-390(T))
device isp # Qlogic family
device mpt # LSI-Logic MPT/Fusion
device ncr # NCR/Symbios Logic
device sym # NCR/Symbios Logic (newer chipsets)
options SYM_SETUP_LP_PROBE_MAP=0x40
# Allow ncr to attach legacy NCR devices when
# both sym and ncr are configured

device adv0 at isa?
device adw
device bt0 at isa?
device aha0 at isa?
device aic0 at isa?

device ncv # NCR 53C500
device nsp # Workbit Ninja SCSI-3
device stg # TMC 18C30/18C50

# SCSI peripherals
device scbus # SCSI bus (required)
device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
device pass # Passthrough device (direct SCSI access)
device sg # Passthrough device (linux scsi generic)

# RAID controllers interfaced to the SCSI subsystem
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device dpt # DPT Smartcache - See LINT for options!
device iir # Intel Integrated RAID
device mly # Mylex AcceleRAID/eXtremeRAID
device ciss # Compaq SmartRAID 5* series

# RAID controllers
device aac # Adaptec FSA RAID, Dell PERC2/PERC3
#device aacp # SCSI passthrough for aac (requires CAM)
device ida # Compaq Smart RAID
device ips # IBM ServeRAID
device amr # AMI MegaRAID
device mlx # Mylex DAC960 family
device twe # 3ware Escalade 7000/8000's
device twa # 3ware Escalade 9000's

# atkbdc0 controls both the keyboard and the PS/2 mouse
device atkbdc0 at isa? port IO_KBD
device atkbd0 at atkbdc? irq 1 flags 0x1
device psm0 at atkbdc? irq 12

device vga0 at isa?

# kbdmux is the keyboard multiplexer
device kbdmux

# splash screen/screen saver
pseudo-device splash

# syscons is the default console driver, resembling an SCO console
#device sc0 at isa? flags 0x100
#options SC_PIXEL_MODE # add support for the raster text mode
device sc0 at isa? flags 0x100
options SC_PIXEL_MODE # add support for the raster text mode

# Floating point support - do not disable.
device npx0 at nexus? port IO_NPX irq 13
device agp # support several AGP chipsets

# Power management support (see LINT for more options)
# device apm0 at nexus? disable flags 0x20 # Advanced Power Management
# HW monitoring devices
device lm0 at isa? port 0x290
device it0 at isa? port 0x290
device it1 at isa? port 0xc00
device it2 at isa? port 0xd00

# PCCARD (PCMCIA) support
device pccard
device cardbus
device cbb

# Serial (COM) ports
device sio0 at isa? port IO_COM1 flags 0x10 irq 4
Expand All @@ -117,13 +184,90 @@ device sio2 at isa? disable port IO_COM3 irq 5
device sio3 at isa? disable port IO_COM4 irq 9

# Parallel port
#device ppc0 at isa? irq 7
#device ppbus # Parallel port bus (required)
#device lpt # Printer
#device plip # TCP/IP over parallel
#device ppi # Parallel port interface device
device ppc0 at isa? irq 7
device ppbus # Parallel port bus (required)
device lpt # Printer
device plip # TCP/IP over parallel
device ppi # Parallel port interface device
#device vpo # Requires scbus and da


# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')

device em # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
# Requires ig_hal
device ig_hal # Intel PRO/1000 hardware abstraction layer

# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
device ae # Attansic/Atheros L2 Fast Ethernet
device age # Attansic/Atheros L1 Gigabit Ethernet
device ale # Atheros AR8121/AR8113/AR8114
device bce # Broadcom NetXtreme II Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
device dc # DEC/Intel 21143 and various workalikes
device et # Agere ET1310 10/100/1000 Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device jme # JMicron Gigabit/Fast Ethernet
device pcn # AMD Am79C97x PCI 10/100 NICs
device rl # RealTek 8129/8139
device re # RealTek 8139C+/8169
device sf # Adaptec AIC-6915 (``Starfire'')
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect GEnesis, LinkSys EG1023, D-Link
device ste # Sundance ST201 (D-Link DFE-550TX)
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vge # VIA 612x GigE
device vr # VIA Rhine, Rhine II
device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
device bge # Broadcom BCM570x (``Tigon III'')
device stge # Sundance/Tamarack TC9021 Gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
device nfe # NVIDIA nForce MCP 10/100/Gigabit Ethernet

# ISA Ethernet NICs.
device ex
# Xircom Ethernet
device xe

# Wireless NIC cards
device wlan # 802.11 support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_wep # 802.11 WEP support
# 802.11 TX rate control algorithms
#device wlan_ratectl_amrr # AMRR
device wlan_ratectl_onoe # Onoe
device wlan_ratectl_sample # Sample

# Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will
# work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP
# mode (the factory default). If you set the switches on your ISA
# card for a manually chosen I/O address and IRQ, you must specify
# those parameters here.
device an
device ral # Ralink Technology 802.11 wireless NIC
# Requires wlan_ratectl_onoe and
# wlan_ratectl_sample
device rtw # RealTek 802.11 wireless NIC
# Requires wlan_ratectl_onoe and wlan_wep
# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
# exists only as a PCMCIA device, so there is no ISA attachment needed
# and resources will always be dynamically assigned by the pccard code.
device wi

# The probe order of these is presently determined by i386/isa/isa_compat.c.
#device le0 at isa? disable port 0x300 irq 5 iomem 0xd0000
device lnc0 at isa? disable port 0x280 irq 10 drq 0
device cs0 at isa? disable port 0x300
device sn0 at isa? disable port 0x300 irq 10

# Pseudo devices - the number indicates how many units to allocate.
pseudo-device loop # Network loopback
pseudo-device ether # Ethernet support
Expand All @@ -134,3 +278,36 @@ pseudo-device pty # Pseudo-ttys (telnet etc)
pseudo-device md # Memory "disks"
pseudo-device gif # IPv6 and IPv4 tunneling
pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation)

# The `bpf' pseudo-device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
pseudo-device bpf #Berkeley packet filter

pseudo-device crypto # core crypto support, used by wlan

# USB support
device uhci # UHCI PCI->USB interface
device ohci # OHCI PCI->USB interface
device usb # USB Bus (required)
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
device uscanner # Scanners
device urio # Diamond Rio MP3 Player
# USB Ethernet, requires mii
device aue # ADMtek USB ethernet
device axe # ASIX Electronics USB Ethernet
device cue # CATC USB ethernet
device kue # Kawasaki LSI USB ethernet
device rue # RealTek 8150 based USB ethernet
# USB wireless NICs, requires wlan, wlan_ratectl_onoe
device rum # Ralink Technology RT2501USB/RT2601USB
device ural # Ralink Technology RT2500USB

# FireWire support
device firewire # FireWire bus code
device sbp # SCSI over FireWire (Requires scbus and da)
device fwe # Ethernet over FireWire (non-standard!)
11 changes: 11 additions & 0 deletions sys/platform/pc64/conf/files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ emulation/linux/amd64/linux32_machdep.c optional compat_linux32
emulation/linux/amd64/linux32_sysent.c optional compat_linux32
emulation/linux/amd64/linux32_sysvec.c optional compat_linux32

# XXX use assembler versions of bf_enc and des_enc
crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
crypto/des/des_enc.c optional ipsec ipsec_esp
crypto/des/des_ecb.c optional netsmbcrypto
crypto/des/des_enc.c optional netsmbcrypto
crypto/des/des_setkey.c optional netsmbcrypto
crypto/blowfish/bf_enc.c optional crypto
crypto/des/des_enc.c optional crypto
crypto/des/des_ecb.c optional crypto
crypto/des/des_setkey.c optional crypto

dev/video/fb/fb.c optional vga
dev/video/fb/splash.c optional splash
dev/video/fb/vga.c optional vga
Expand Down

0 comments on commit 503ce1e

Please sign in to comment.