svn commit: r313839 - in head: share/man/man5 share/man/man9 share/mk sys/conf sys/dev/eisa sys/i386/conf sys/x86/x86 tools/build/options tools/kerneldoc/subsys
Warner Losh
imp at FreeBSD.org
Thu Feb 16 21:57:38 UTC 2017
Author: imp
Date: Thu Feb 16 21:57:35 2017
New Revision: 313839
URL: https://svnweb.freebsd.org/changeset/base/313839
Log:
Remove EISA bus support for add-in cards. Remove related kernel and
compile options. Remove doxygen pointers to now deleted files. Remove
EISA and VME as examples in bus_space.9.
Retained EISA mode code for IO PIC and MPTABLES because that's not
EISA bus, per se, and some people have abused EISA to mean "EISA-like
behavior as opposed to ISA" rather than using it for EISA add-in
cards.
Relnotes: yes
Deleted:
head/sys/dev/eisa/eisa_if.m
head/sys/dev/eisa/eisaconf.c
head/sys/dev/eisa/eisaconf.h
head/tools/build/options/WITH_EISA
head/tools/kerneldoc/subsys/Doxyfile-dev_eisa
Modified:
head/share/man/man5/src.conf.5
head/share/man/man9/bus_space.9
head/share/mk/src.opts.mk
head/sys/conf/NOTES
head/sys/conf/config.mk
head/sys/conf/files
head/sys/conf/options
head/sys/i386/conf/NOTES
head/sys/x86/x86/legacy.c
Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5 Thu Feb 16 21:57:30 2017 (r313838)
+++ head/share/man/man5/src.conf.5 Thu Feb 16 21:57:35 2017 (r313839)
@@ -653,9 +653,6 @@ and
.Pp
It is a default setting on
amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386.
-.It Va WITH_EISA
-.\" from FreeBSD: head/tools/build/options/WITH_EISA 264654 2014-04-18 16:53:06Z imp
-Set to build EISA kernel modules.
.It Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP
.\" from FreeBSD: head/tools/build/options/WITHOUT_ELFTOOLCHAIN_BOOTSTRAP 295491 2016-02-11 00:14:00Z emaste
Set to not build ELF Tool Chain tools
Modified: head/share/man/man9/bus_space.9
==============================================================================
--- head/share/man/man9/bus_space.9 Thu Feb 16 21:57:30 2017 (r313838)
+++ head/share/man/man9/bus_space.9 Thu Feb 16 21:57:35 2017 (r313839)
@@ -853,8 +853,8 @@ Some implementations may keep track of u
bus spaces and refuse to allow duplicate allocations.
This is encouraged
for bus spaces which have no notion of slot-specific space addressing,
-such as ISA and VME, and for spaces which coexist with those spaces
-(e.g.\& EISA and PCI memory and I/O spaces co-existing with ISA memory and
+such as ISA, and for spaces which coexist with those spaces
+(e.g.\& PCI memory and I/O spaces co-existing with ISA memory and
I/O spaces).
.Pp
Mapped regions may contain areas for which there is no device on the
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Thu Feb 16 21:57:30 2017 (r313838)
+++ head/share/mk/src.opts.mk Thu Feb 16 21:57:35 2017 (r313839)
@@ -183,7 +183,6 @@ __DEFAULT_NO_OPTIONS = \
BSD_GREP \
CLANG_EXTRAS \
DTRACE_TESTS \
- EISA \
HESIOD \
LIBSOFT \
NAND \
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Thu Feb 16 21:57:30 2017 (r313838)
+++ head/sys/conf/NOTES Thu Feb 16 21:57:35 2017 (r313839)
@@ -1429,7 +1429,7 @@ options PCI_IOV # PCI SR-IOV support
# HARDWARE DEVICE CONFIGURATION
# For ISA the required hints are listed.
-# EISA, PCI, CardBus, SD/MMC and pccard are self identifying buses, so
+# PCI, CardBus, SD/MMC and pccard are self identifying buses, so
# no hints are needed.
#
@@ -1556,7 +1556,7 @@ options TERMINAL_KERN_ATTR=(FG_LIGHTRED
# trm: Tekram DC395U/UW/F DC315U adapters.
#
-# Note that the order is important in order for Buslogic ISA/EISA cards to be
+# Note that the order is important in order for Buslogic ISA cards to be
# probed correctly.
#
device bt
@@ -2074,7 +2074,7 @@ device xmphy # XaQti XMAC II
# in Dell Latitude laptop docking stations.
# Also supported: 3Com 3c980(C)-TX, 3Com 3cSOHO100-TX, 3Com 3c450-TX
-# Order for ISA/EISA devices is important here
+# Order for ISA devices is important here
device cm
hint.cm.0.at="isa"
Modified: head/sys/conf/config.mk
==============================================================================
--- head/sys/conf/config.mk Thu Feb 16 21:57:30 2017 (r313838)
+++ head/sys/conf/config.mk Thu Feb 16 21:57:35 2017 (r313839)
@@ -23,10 +23,6 @@ opt_inet6.h:
opt_ratelimit.h:
@echo "#define RATELIMIT 1" > ${.TARGET}
.endif
-.if ${MK_EISA} != "no"
-opt_eisa.h:
- @echo "#define DEV_EISA 1" > ${.TARGET}
-.endif
opt_mrouting.h:
echo "#define MROUTING 1" > ${.TARGET}
opt_natm.h:
@@ -49,9 +45,6 @@ KERN_OPTS+= INET TCP_OFFLOAD
.if ${MK_INET6_SUPPORT} != "no"
KERN_OPTS+= INET6
.endif
-.if ${MK_EISA} != "no"
-KERN_OPTS+= DEV_EISA
-.endif
.elif !defined(KERN_OPTS)
KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u
.export KERN_OPTS
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Feb 16 21:57:30 2017 (r313838)
+++ head/sys/conf/files Thu Feb 16 21:57:35 2017 (r313839)
@@ -1554,8 +1554,6 @@ dev/ed/if_ed_rtl80x9.c optional ed
dev/ed/if_ed_pccard.c optional ed pccard
dev/ed/if_ed_pci.c optional ed pci
dev/efidev/efidev.c optional efirt
-dev/eisa/eisa_if.m standard
-dev/eisa/eisaconf.c optional eisa
dev/e1000/if_em.c optional em \
compile-with "${NORMAL_C} -I$S/dev/e1000"
dev/e1000/em_txrx.c optional em \
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Thu Feb 16 21:57:30 2017 (r313838)
+++ head/sys/conf/options Thu Feb 16 21:57:35 2017 (r313839)
@@ -732,10 +732,6 @@ DEV_RANDOM opt_global.h
DEV_SPLASH opt_splash.h
DEV_VLAN opt_vlan.h
-# EISA support
-DEV_EISA opt_eisa.h
-EISA_SLOTS opt_eisa.h
-
# ed driver
ED_HPP opt_ed.h
ED_3C503 opt_ed.h
Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES Thu Feb 16 21:57:30 2017 (r313838)
+++ head/sys/i386/conf/NOTES Thu Feb 16 21:57:35 2017 (r313839)
@@ -337,22 +337,6 @@ options MAXMEM=(128*1024)
#options BROKEN_KEYBOARD_RESET
#
-# EISA bus
-#
-# The EISA bus device is `eisa'. It provides auto-detection and
-# configuration support for all devices on the EISA bus.
-
-device eisa
-
-# By default, only 10 EISA slots are probed, since the slot numbers
-# above clash with the configuration address space of the PCI subsystem,
-# and the EISA probe is not very smart about this. This is sufficient
-# for most machines, but in particular the HP NetServer LC series comes
-# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11,
-# thus you need to bump this figure to 12 for them.
-options EISA_SLOTS=12
-
-#
# AGP GART support
device agp
Modified: head/sys/x86/x86/legacy.c
==============================================================================
--- head/sys/x86/x86/legacy.c Thu Feb 16 21:57:30 2017 (r313838)
+++ head/sys/x86/x86/legacy.c Thu Feb 16 21:57:35 2017 (r313839)
@@ -27,9 +27,6 @@
* SUCH DAMAGE.
*/
-#ifdef __i386__
-#include "opt_eisa.h"
-#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -128,17 +125,9 @@ legacy_attach(device_t dev)
bus_generic_attach(dev);
/*
- * If we didn't see EISA or ISA on a pci bridge, create some
+ * If we didn't see ISA on a pci bridge, create some
* connection points now so they show up "on motherboard".
*/
-#ifdef DEV_EISA
- if (!devclass_get_device(devclass_find("eisa"), 0)) {
- child = BUS_ADD_CHILD(dev, 0, "eisa", 0);
- if (child == NULL)
- panic("legacy_attach eisa");
- device_probe_and_attach(child);
- }
-#endif
if (!devclass_get_device(devclass_find("isa"), 0)) {
child = BUS_ADD_CHILD(dev, 0, "isa", 0);
if (child == NULL)
More information about the svn-src-head
mailing list