Author: imp
Date: Fri Apr 18 16:53:06 2014
New Revision: 264654
URL: http://svnweb.freebsd.org/changeset/base/264654
Log:
Don't build EISA by default anymore. Remove from i386 GENERIC and
create an option that defaults to "no" on all platforms to not build
the EISA bits.
Discussed on: arch@
Added:
head/tools/build/options/WITH_EISA (contents, props changed)
Modified:
head/share/mk/bsd.own.mk
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
head/sys/modules/aic7xxx/ahc/Makefile
head/sys/modules/dpt/Makefile
head/sys/modules/ep/Makefile
head/sys/modules/vx/Makefile
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Fri Apr 18 16:19:33 2014 (r264653)
+++ head/share/mk/bsd.own.mk Fri Apr 18 16:53:06 2014 (r264654)
@@ -354,6 +354,7 @@ __DEFAULT_NO_OPTIONS = \
CLANG_EXTRAS \
CTF \
DEBUG_FILES \
+ EISA \
HESIOD \
INSTALL_AS_USER \
LLDB \
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Fri Apr 18 16:19:33 2014 (r264653)
+++ head/sys/i386/conf/GENERIC Fri Apr 18 16:53:06 2014 (r264654)
@@ -94,7 +94,6 @@ device cpufreq
# Bus support.
device acpi
-device eisa
device pci
# Floppy drives
@@ -108,7 +107,6 @@ device mvs # Marvell
88SX50XX/88SX60X
device siis # SiliconImage SiI3124/SiI3132/SiI3531
SATA
# SCSI Controllers
-device ahb # EISA AHA1742 family
device ahc # AHA2940 and onboard AIC7xxx devices
options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~128k to driver.
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Fri Apr 18 16:19:33 2014 (r264653)
+++ head/sys/modules/Makefile Fri Apr 18 16:53:06 2014 (r264654)
@@ -561,7 +561,9 @@ _acpi= acpi
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_aesni= aesni
.endif
+.if ${MK_EISA} != "no"
_ahb= ahb
+.endif
_amdsbwd= amdsbwd
_amdtemp= amdtemp
_arcmsr= arcmsr
Modified: head/sys/modules/aic7xxx/ahc/Makefile
==============================================================================
--- head/sys/modules/aic7xxx/ahc/Makefile Fri Apr 18 16:19:33 2014
(r264653)
+++ head/sys/modules/aic7xxx/ahc/Makefile Fri Apr 18 16:53:06 2014
(r264654)
@@ -1,9 +1,14 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
.PATH: ${.CURDIR}/../../../dev/aic7xxx
KMOD= ahc
-SUBDIR= ahc_eisa ahc_isa ahc_pci
+.if ${MK_EISA} != "no"
+SUBDIR+= ahc_eisa
+.endif
+SUBDIR+= ahc_isa ahc_pci
GENSRCS= aic7xxx_seq.h aic7xxx_reg.h
AHC_REG_PRETTY_PRINT=1
Modified: head/sys/modules/dpt/Makefile
==============================================================================
--- head/sys/modules/dpt/Makefile Fri Apr 18 16:19:33 2014
(r264653)
+++ head/sys/modules/dpt/Makefile Fri Apr 18 16:53:06 2014
(r264654)
@@ -1,5 +1,6 @@
# $FreeBSD$
-#
+
+.include <bsd.own.mk>
.PATH: ${.CURDIR}/../../dev/dpt
KMOD= dpt
@@ -9,7 +10,7 @@ SRCS= dpt_scsi.c dpt.h \
opt_cam.h opt_scsi.h \
device_if.h bus_if.h
-.if ${MACHINE} != "i386"
+.if ${MK_EISA} == "no"
# Create an empty opt_eisa.h in order to keep kmod.mk from linking in an
# existing one from KERNBUILDDIR which possibly has DEV_EISA defined so
# dpt.ko is always built without EISA support.
Modified: head/sys/modules/ep/Makefile
==============================================================================
--- head/sys/modules/ep/Makefile Fri Apr 18 16:19:33 2014
(r264653)
+++ head/sys/modules/ep/Makefile Fri Apr 18 16:53:06 2014
(r264654)
@@ -1,12 +1,16 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
.PATH: ${.CURDIR}/../../dev/ep
KMOD= if_ep
SRCS= if_ep.c
SRCS+= if_ep_pccard.c pccarddevs.h card_if.h
SRCS+= if_ep_isa.c isa_if.h
+.if ${MK_EISA} != "no"
SRCS+= if_ep_eisa.c eisa_if.h
+.endif
#SRCS+= if_ep_mca.c
SRCS+= bus_if.h device_if.h
Modified: head/sys/modules/vx/Makefile
==============================================================================
--- head/sys/modules/vx/Makefile Fri Apr 18 16:19:33 2014
(r264653)
+++ head/sys/modules/vx/Makefile Fri Apr 18 16:53:06 2014
(r264654)
@@ -1,10 +1,12 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
.PATH: ${.CURDIR}/../../dev/vx
KMOD= if_vx
SRCS= if_vx.c if_vx_pci.c
-.if ${MACHINE_CPUARCH} == "i386"
+.if ${MK_EISA} != "no"
SRCS+= if_vx_eisa.c
.endif
SRCS+= device_if.h bus_if.h pci_if.h eisa_if.h
Added: head/tools/build/options/WITH_EISA
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITH_EISA Fri Apr 18 16:53:06 2014
(r264654)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build EISA kernel modules.
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
