svn commit: r192122 - in head/sys: amd64/conf i386/conf

[John Baldwin]

Author: jhb
Date: Thu May 14 21:53:35 2009
New Revision: 192122
URL: http://svn.freebsd.org/changeset/base/192122

Log:
  Trim the default set of device hints on i386 and amd64:
  - Remove vga0 and the disabled uart2/uart3 hints from both platforms.
  - Remove hints for ISA adv0, bt0, aha0, aic0, ed0, cs0, sn0, ie0, fe0, and
    le0 from i386.  All these hints were marked 'disabled' and thus already
    did not work "out of the box".
  
  Discussed with:	imp

Modified:
  head/sys/amd64/conf/GENERIC.hints
  head/sys/i386/conf/GENERIC.hints

Modified: head/sys/amd64/conf/GENERIC.hints
==============================================================================
--- head/sys/amd64/conf/GENERIC.hints	Thu May 14 21:39:08 2009	(r192121)
+++ head/sys/amd64/conf/GENERIC.hints	Thu May 14 21:53:35 2009	(r192122)
@@ -13,7 +13,6 @@ hint.atkbd.0.at="atkbdc"
 hint.atkbd.0.irq="1"
 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.uart.0.at="isa"
@@ -23,13 +22,5 @@ hint.uart.0.irq="4"
 hint.uart.1.at="isa"
 hint.uart.1.port="0x2F8"
 hint.uart.1.irq="3"
-hint.uart.2.at="isa"
-hint.uart.2.disabled="1"
-hint.uart.2.port="0x3E8"
-hint.uart.2.irq="5"
-hint.uart.3.at="isa"
-hint.uart.3.disabled="1"
-hint.uart.3.port="0x2E8"
-hint.uart.3.irq="9"
 hint.ppc.0.at="isa"
 hint.ppc.0.irq="7"

Modified: head/sys/i386/conf/GENERIC.hints
==============================================================================
--- head/sys/i386/conf/GENERIC.hints	Thu May 14 21:39:08 2009	(r192121)
+++ head/sys/i386/conf/GENERIC.hints	Thu May 14 21:53:35 2009	(r192122)
@@ -13,21 +13,12 @@ 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.adv.0.disabled="1"
-hint.bt.0.at="isa"
-hint.bt.0.disabled="1"
-hint.aha.0.at="isa"
-hint.aha.0.disabled="1"
-hint.aic.0.at="isa"
-hint.aic.0.disabled="1"
 hint.atkbdc.0.at="isa"
 hint.atkbdc.0.port="0x060"
 hint.atkbd.0.at="atkbdc"
 hint.atkbd.0.irq="1"
 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.apm.0.disabled="1"
@@ -39,41 +30,8 @@ hint.uart.0.irq="4"
 hint.uart.1.at="isa"
 hint.uart.1.port="0x2F8"
 hint.uart.1.irq="3"
-hint.uart.2.at="isa"
-hint.uart.2.disabled="1"
-hint.uart.2.port="0x3E8"
-hint.uart.2.irq="5"
-hint.uart.3.at="isa"
-hint.uart.3.disabled="1"
-hint.uart.3.port="0x2E8"
-hint.uart.3.irq="9"
 hint.ppc.0.at="isa"
 hint.ppc.0.irq="7"
-hint.ed.0.at="isa"
-hint.ed.0.disabled="1"
-hint.ed.0.port="0x280"
-hint.ed.0.irq="10"
-hint.ed.0.maddr="0xd8000"
-hint.cs.0.at="isa"
-hint.cs.0.disabled="1"
-hint.cs.0.port="0x300"
-hint.sn.0.at="isa"
-hint.sn.0.disabled="1"
-hint.sn.0.port="0x300"
-hint.sn.0.irq="10"
-hint.ie.0.at="isa"
-hint.ie.0.disabled="1"
-hint.ie.0.port="0x300"
-hint.ie.0.irq="10"
-hint.ie.0.maddr="0xd0000"
-hint.fe.0.at="isa"
-hint.fe.0.disabled="1"
-hint.fe.0.port="0x300"
-hint.le.0.at="isa"
-hint.le.0.disabled="1"
-hint.le.0.port="0x280"
-hint.le.0.irq="10"
-hint.le.0.drq="0"
 hint.atrtc.0.at="isa"
 hint.atrtc.0.port="0x70"
 hint.atrtc.0.irq="8"