diff options
author | peter <peter@FreeBSD.org> | 2000-06-13 22:28:50 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-06-13 22:28:50 +0000 |
commit | 647ef85d48424b2f17b827cdc91e595b17c66455 (patch) | |
tree | 356af9076580e616e17aaffdac3db15319e62b95 /sys/amd64/conf | |
parent | c859e3ccfbf4963472ba1374f7ea67b524d43395 (diff) | |
download | FreeBSD-src-647ef85d48424b2f17b827cdc91e595b17c66455.zip FreeBSD-src-647ef85d48424b2f17b827cdc91e595b17c66455.tar.gz |
Borrow phk's axe and apply the next stage of config(8)'s evolution.
Use Warner Losh's "hint" driver to decode ascii strings to fill the
resource table at boot time.
config(8) no longer generates an ioconf.c table - ie: the configuration
no longer has to be compiled into the kernel. You can reconfigure your
isa devices with the likes of this at loader(8) time:
set hint.ed.0.port=0x320
userconfig will be rewritten to use this style interface one day and will
move to /boot/userconfig.4th or something like that.
It is still possible to statically compile in a set of hints into a kernel
if you do not wish to use loader(8). See the "hints" directive in GENERIC
as an example.
All device wiring has been moved out of config(8). There is a set of
helper scripts (see i386/conf/gethints.pl, and the same for alpha and pc98)
that extract the 'at isa? port foo irq bar' from the old files and produces
a hints file. If you install this file as /boot/device.hints (and update
/boot/defaults/loader.conf - You can do a build/install in sys/boot) then
loader will load it automatically for you. You can also compile in the
hints directly with: hints "device.hints" as well.
There are a few things that I'm not too happy with yet. Under this scheme,
things like LINT would no longer be useful as "documentation" of settings.
I have renamed this file to 'NOTES' and stored the example hints strings
in it. However... this is not something that config(8) understands, so
there is a script that extracts the build-specific data from the
documentation file (NOTES) to produce a LINT that can be config'ed and
built. A stack of man4 pages will need updating. :-/
Also, since there is no longer a difference between 'device' and
'pseudo-device' I collapsed the two together, and the resulting 'device'
takes a 'number of units' for devices that still have it statically
allocated. eg: 'device fe 4' will compile the fe driver with NFE set
to 4. You can then set hints for 4 units (0 - 3). Also note that
'device fe0' will be interpreted as "zero units of 'fe'" which would be
bad, so there is a config warning for this. This is only needed for
old drivers that still have static limits on numbers of units.
All the statically limited drivers that I could find were marked.
Please exercise EXTREME CAUTION when transitioning!
Moral support by: phk, msmith, dfr, asmodai, imp, and others
Diffstat (limited to 'sys/amd64/conf')
-rw-r--r-- | sys/amd64/conf/GENERIC | 86 | ||||
-rw-r--r-- | sys/amd64/conf/GENERIC.hints | 85 | ||||
-rw-r--r-- | sys/amd64/conf/Makefile | 7 |
3 files changed, 132 insertions, 46 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index ed19bb9..404fb9a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -25,6 +25,8 @@ cpu I686_CPU ident GENERIC maxusers 32 +hints "GENERIC.hints" #Default places to look for devices. + #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options MATH_EMULATE #Support for x87 emulation @@ -65,17 +67,13 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev device isa device eisa device pci -options COMPAT_OLDISA # Old ISA driver shims -options COMPAT_OLDPCI # Old PCI driver shims +options COMPAT_OLDISA # compatability shims for lnc, fe, le +options COMPAT_OLDPCI # compatability shims for lnc, vx # 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 +device fdc # ATA and ATAPI devices -device ata0 at isa? port IO_WD1 irq 14 -device ata1 at isa? port IO_WD2 irq 15 device ata device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives @@ -93,11 +91,11 @@ device isp # Qlogic family device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets) -device adv0 at isa? +device adv device adw -device bt0 at isa? -device aha0 at isa? -device aic0 at isa? +device bt +device aha 1 +device aic # SCSI peripherals device scbus # SCSI bus (required) @@ -112,44 +110,40 @@ device amr # AMI MegaRAID device mlx # Mylex DAC960 family # 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 atkbdc 1 +device atkbd +device psm -device vga0 at isa? +device vga # splash screen/screen saver -pseudo-device splash +device splash # syscons is the default console driver, resembling an SCO console -device sc0 at isa? flags 0x100 +device sc 1 # Enable this for the pcvt (VT220 compatible) console driver -#device vt0 at isa? +#device vt #options XSERVER # support for X server on a vt console #options FAT_CURSOR # start with block cursor # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines #options PCVT_SCANSET=2 # IBM keyboards are non-std # Floating point support - do not disable. -device npx0 at nexus? port IO_NPX irq 13 +device npx # Power management support (see LINT for more options) -device apm0 at nexus? disable flags 0x20 # Advanced Power Management +device apm # PCCARD (PCMCIA) support device card -device pcic0 at isa? irq 10 port 0x3e0 iomem 0xd0000 -device pcic1 at isa? irq 11 port 0x3e2 iomem 0xd4000 disable +device pcic # Serial (COM) ports -device sio0 at isa? port IO_COM1 flags 0x10 irq 4 -device sio1 at isa? port IO_COM2 irq 3 -device sio2 at isa? disable port IO_COM3 irq 5 -device sio3 at isa? disable port IO_COM4 irq 9 +device sio # Parallel port -device ppc0 at isa? irq 7 +device ppc device ppbus # Parallel port bus (required) device lpt # Printer device plip # TCP/IP over parallel @@ -177,11 +171,11 @@ device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # ISA Ethernet NICs. -device ed0 at isa? port 0x280 irq 10 iomem 0xd8000 +device ed device ex device ep -device cs0 at isa? port 0x300 -device sn0 at isa? port 0x300 irq 10 +device cs +device sn # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really # exists only as a PCMCIA device, so there is no ISA attatement needed # and resources will always be dynamically assigned by the pccard code. @@ -197,25 +191,25 @@ device awi # Xircom pccard ethernet device xe # The probe order of these is presently determined by i386/isa/isa_compat.c. -device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 -device fe0 at isa? port 0x300 -device le0 at isa? port 0x300 irq 5 iomem 0xd0000 -device lnc0 at isa? port 0x280 irq 10 drq 0 +device ie +device fe +device le +device lnc # Pseudo devices - the number indicates how many units to allocated. -pseudo-device loop # Network loopback -pseudo-device ether # Ethernet support -pseudo-device sl # Kernel SLIP -pseudo-device ppp 1 # Kernel PPP -pseudo-device tun # Packet tunnel. -pseudo-device pty # Pseudo-ttys (telnet etc) -pseudo-device md # Memory "disks" -pseudo-device gif 4 # IPv6 and IPv4 tunneling -pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) - -# The `bpf' pseudo-device enables the Berkeley Packet Filter. +device loop # Network loopback +device ether # Ethernet support +device sl # Kernel SLIP +device ppp 1 # Kernel PPP +device tun # Packet tunnel. +device pty # Pseudo-ttys (telnet etc) +device md # Memory "disks" +device gif 4 # IPv6 and IPv4 tunneling +device faith 1 # IPv6-to-IPv4 relaying (translation) + +# The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -pseudo-device bpf # Berkeley packet filter +device bpf # Berkeley packet filter # USB support device uhci # UHCI PCI->USB interface diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints new file mode 100644 index 0000000..29183de --- /dev/null +++ b/sys/amd64/conf/GENERIC.hints @@ -0,0 +1,85 @@ +# $FreeBSD$ +hint.fdc.0.at="isa" +hint.fdc.0.port="0x3F0" +hint.fdc.0.irq="6" +hint.fdc.0.drq="2" +hint.fd.0.at="fdc0" +hint.fd.0.drive="0" +hint.fd.1.at="fdc0" +hint.fd.1.drive="1" +hint.ata.0.at="isa" +hint.ata.0.port="0x1F0" +hint.ata.0.irq="14" +hint.ata.1.at="isa" +hint.ata.1.port="0x170" +hint.ata.1.irq="15" +hint.adv.0.at="isa" +hint.bt.0.at="isa" +hint.aha.0.at="isa" +hint.aic.0.at="isa" +hint.atkbdc.0.at="isa" +hint.atkbdc.0.port="0x060" +hint.atkbd.0.at="atkbdc" +hint.atkbd.0.irq="1" +hint.atkbd.0.flags="0x1" +hint.psm.0.at="atkbdc" +hint.psm.0.irq="12" +hint.vga.0.at="isa" +hint.sc.0.at="isa" +hint.sc.0.flags="0x100" +hint.vt.0.at="isa" +hint.npx.0.at="nexus" +hint.npx.0.port="0x0F0" +hint.npx.0.irq="13" +hint.apm.0.at="nexus" +hint.apm.0.disabled="1" +hint.apm.0.flags="0x20" +hint.pcic.0.at="isa" +hint.pcic.0.irq="10" +hint.pcic.0.port="0x3e0" +hint.pcic.0.iomem="0xd0000" +hint.pcic.1.at="isa" +hint.pcic.1.irq="11" +hint.pcic.1.port="0x3e2" +hint.pcic.1.iomem="0xd4000" +hint.pcic.1.disabled="1" +hint.sio.0.at="isa" +hint.sio.0.port="0x3F8" +hint.sio.0.flags="0x10" +hint.sio.0.irq="4" +hint.sio.1.at="isa" +hint.sio.1.port="0x2F8" +hint.sio.1.irq="3" +hint.sio.2.at="isa" +hint.sio.2.disabled="1" +hint.sio.2.port="0x3E8" +hint.sio.2.irq="5" +hint.sio.3.at="isa" +hint.sio.3.disabled="1" +hint.sio.3.port="0x2E8" +hint.sio.3.irq="9" +hint.ppc.0.at="isa" +hint.ppc.0.irq="7" +hint.ed.0.at="isa" +hint.ed.0.port="0x280" +hint.ed.0.irq="10" +hint.ed.0.iomem="0xd8000" +hint.cs.0.at="isa" +hint.cs.0.port="0x300" +hint.sn.0.at="isa" +hint.sn.0.port="0x300" +hint.sn.0.irq="10" +hint.ie.0.at="isa" +hint.ie.0.port="0x300" +hint.ie.0.irq="10" +hint.ie.0.iomem="0xd0000" +hint.fe.0.at="isa" +hint.fe.0.port="0x300" +hint.le.0.at="isa" +hint.le.0.port="0x300" +hint.le.0.irq="5" +hint.le.0.iomem="0xd0000" +hint.lnc.0.at="isa" +hint.lnc.0.port="0x280" +hint.lnc.0.irq="10" +hint.lnc.0.drq="0" diff --git a/sys/amd64/conf/Makefile b/sys/amd64/conf/Makefile new file mode 100644 index 0000000..67fff85 --- /dev/null +++ b/sys/amd64/conf/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +all: + @echo "make LINT only" + +LINT: NOTES makeLINT.pl + perl5 makeLINT.pl < NOTES > LINT |