4027 remove CLOSED_BUILD

4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>

10 files changed, 25 insertions, 161 deletions

diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile
index 46b2368ec9..72b2d89989 100644
--- a/usr/src/uts/intel/Makefile
+++ b/usr/src/uts/intel/Makefile
@@ -33,15 +33,7 @@ LINT_KMODS_X1	= $(LINT_KMODS:nsmb=)
 LINT_KMODS_X2	= $(LINT_KMODS_X1:smbfs=)
 LINT_KMODLIBS	= $(LINT_KMODS_X2:e1000g=)
 LINT_LIBS	= $(LINT_LIB) $(GEN_LINT_LIB) \
-		  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		  $(CLOSED_LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) 
-
-$(CLOSED_BUILD)LINT_LIBS	+= $(SVVS_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD4	= $(CLOSED_XMODS:bnx=)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD3	= $(LINT_CLOSED_XMOD4:bnxe=)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD2	= $(LINT_CLOSED_XMOD3:lsimega=)
-$(CLOSED_BUILD)LINT_CLOSED_XMOD1	= $(LINT_CLOSED_XMOD2:adpu320=)
-$(CLOSED_BUILD)LINT_LIBS	+= $(LINT_XMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
+		  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
 
 #
 # dprov is delivered in the SUNWcryptoint package.
@@ -70,11 +62,9 @@ install_h.prereq	:=	TARGET= install_h
 
 .KEEP_STATE:
 
-.PARALLEL:	$(PARALLEL_KMODS) $(CLOSED_KMODS) $(SVVS) $(XMODS) \
-		$(CLOSED_XMODS) config $(LINT_DEPS)
+.PARALLEL:	$(PARALLEL_KMODS) $(XMODS) config $(LINT_DEPS)
 
-def all install clean clobber modlist: $(KMODS) $(CLOSED_KMODS) \
-	$(SVVS) $(XMODS) $(CLOSED_XMODS) config
+def all install clean clobber modlist: $(KMODS) $(XMODS) config
 
 clobber: clobber.targ
 
@@ -132,15 +122,11 @@ lint.prereq: FRC
 
 genunix: $(PRIVS_C)
 
-modlintlib clean.lint: $(LINT_KMODS) $(CLOSED_LINT_KMODS) $(SVVS) \
-	$(XMODS) $(CLOSED_XMODS)
+modlintlib clean.lint: $(LINT_KMODS) $(XMODS)
 
 $(KMODS) $(SUBDIRS) config:	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_KMODS):	FRC
-	cd $(CLOSED)/uts/intel/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 $(XMODS):	FRC
 	@if [ -f $@/Makefile  ]; then \
 		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
@@ -148,14 +134,6 @@ $(XMODS):	FRC
 		true; \
 	fi
 
-$(SVVS) $(CLOSED_XMODS):	FRC
-	@if [ -f $(CLOSED)/uts/intel/$@/Makefile  ]; then \
-		cd $(CLOSED)/uts/intel/$@; pwd; \
-		    $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
-
 install_h check:	FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
 	@cd asm; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files
index 082c4eefb3..01147a5314 100644
--- a/usr/src/uts/intel/Makefile.files
+++ b/usr/src/uts/intel/Makefile.files
@@ -287,3 +287,24 @@ MCAMD_OBJS	+= \
 	mcamd_dimmcfg.o \
 	mcamd_subr.o \
 	mcamd_pcicfg.o
+
+#
+# Intel Nehalem memory controller module
+#
+INTEL_NHM_OBJS += \
+	nhm_init.o \
+	mem_addr.o \
+	intel_nhmdrv.o \
+	nhm_pci_cfg.o \
+	dimm_topo.o \
+	intel_nhm.o
+
+#
+# Intel 5000/5100/5400/7300 chipset memory controller hub (MCH) module
+#
+INTEL_NB5000_OBJS += \
+	intel_nb5000.o \
+	intel_nbdrv.o \
+	dimm_addr.o \
+	nb_pci_cfg.o \
+	nb5000_init.o
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index b86fb0a65a..a713e67480 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -368,17 +368,6 @@ DRV_KMODS	+= ncall nsctl sdbc nskern sv
 DRV_KMODS	+= ii rdc rdcsrv rdcstub 
 DRV_KMODS	+= iptun
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= bmc
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= glm
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= intel_nhmex
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= cpqary3
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= marvell88sx
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= bcm_sata
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= memtest
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= mpt
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= atiatom
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= acpi_toshiba
-
 #
 # Common code drivers
 #
@@ -403,7 +392,6 @@ DRV_KMODS	+= ipmi
 DRV_KMODS	+= iprb
 DRV_KMODS	+= ixgbe
 DRV_KMODS	+= vr
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= ixgb
 
 #
 # Virtio drivers
@@ -488,8 +476,6 @@ DRV_KMODS	+= wusb_df
 DRV_KMODS	+= wusb_ca
 DRV_KMODS	+= usbecm
 
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= usbser_edge
-
 #
 #	1394 modules
 #
@@ -654,10 +640,6 @@ MISC_KMODS	+= uwba
 
 MISC_KMODS	+= klmmod klmops
 
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_asym_lsi
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_asym_emc
-$(CLOSED_BUILD)CLOSED_MISC_KMODS	+= scsi_vhci_f_sym_emc
-
 #
 #	Software Cryptographic Providers (/kernel/crypto):
 #
@@ -689,26 +671,8 @@ IPP_KMODS	+= tswtclmt
 GENUNIX_KMODS	+= genunix
 
 #
-#	SVVS Testing Modules (/kernel/strmod):
-#
-#	These are streams and driver modules which are not to be
-#	delivered with a released system. However, during development
-#	it is convenient to build and install the SVVS kernel modules.
-#
-SVVS_KMODS	+= lmodb lmode lmodr lmodt svvslo tidg tivc tmux
-
-$(CLOSED_BUILD)SVVS		+= svvs
-
-#
 #	Modules eXcluded from the product:
 #
-$(CLOSED_BUILD)CLOSED_XMODS =		\
-	adpu320		\
-	bnx		\
-	bnxe		\
-	lsimega		\
-	sdpib
-
 
 #
 #	'Dacf' Modules (/kernel/dacf):
diff --git a/usr/src/uts/intel/intel_nb5000/Makefile b/usr/src/uts/intel/intel_nb5000/Makefile
index ec9092d791..55ee9be813 100644
--- a/usr/src/uts/intel/intel_nb5000/Makefile
+++ b/usr/src/uts/intel/intel_nb5000/Makefile
@@ -30,7 +30,6 @@
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE = ../..
-UTSCLOSED = ../../../../closed/uts
 
 #
 #       Define the module and object file sets.
@@ -46,20 +45,6 @@ CONF_SRCDIR	= $(UTSBASE)/intel/io/intel_nb5000
 #
 include ../Makefile.intel
 
-#
-# The list of object files is defined here, rather than in Makefile.files,
-# because the "$(CLOSED_BUILD)" macro has not been defined at the time
-# Makefile.files is processed.
-#
-INTEL_NB5000_OBJS += \
-	intel_nb5000.o \
-	intel_nbdrv.o \
-	dimm_addr.o \
-	nb_pci_cfg.o \
-	nb5000_init.o
-
-$(CLOSED_BUILD)INTEL_NB5000_OBJS += memtrans.o
-
 OBJECTS		= $(INTEL_NB5000_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(INTEL_NB5000_OBJS:%.o=$(LINTS_DIR)/%.ln)
 
@@ -105,4 +90,3 @@ $(OBJECTS): $(OBJS_DIR) $(MCAMD_OFF_H)
 #       Include common targets.
 #
 include ../Makefile.targ
-$(CLOSED_BUILD)include $(UTSCLOSED)/intel/Makefile.rules
diff --git a/usr/src/uts/intel/intel_nhm/Makefile b/usr/src/uts/intel/intel_nhm/Makefile
index cc21adac2a..73e594c92f 100644
--- a/usr/src/uts/intel/intel_nhm/Makefile
+++ b/usr/src/uts/intel/intel_nhm/Makefile
@@ -29,7 +29,6 @@
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
 #
 UTSBASE = ../..
-UTSCLOSED = ../../../../closed/uts
 
 #
 #       Define the module and object file sets.
@@ -44,22 +43,6 @@ CONF_SRCDIR	= $(UTSBASE)/intel/io/intel_nhm
 #
 include $(UTSBASE)/intel/Makefile.intel
 
-#
-# The list of object files is defined here, rather than in Makefile.files,
-# because the "$(CLOSED_BUILD)" macro has not been defined at the time
-# Makefile.files is processed.
-#
-INTEL_NHM_OBJS += \
-	nhm_init.o \
-	mem_addr.o \
-	intel_nhmdrv.o \
-	nhm_pci_cfg.o \
-	dimm_topo.o \
-	intel_nhm.o
-
-$(CLOSED_BUILD)INTEL_NHM_OBJS += \
-	nhm_dimm_addr.o
-
 OBJECTS		= $(INTEL_NHM_OBJS:%=$(OBJS_DIR)/%)
 LINTS           = $(INTEL_NHM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 
@@ -100,4 +83,3 @@ install:        $(INSTALL_DEPS)
 #       Include common targets.
 #
 include ../Makefile.targ
-$(CLOSED_BUILD)include $(UTSCLOSED)/intel/Makefile.rules
diff --git a/usr/src/uts/intel/sd/Makefile b/usr/src/uts/intel/sd/Makefile
index bac6d94908..42af2b7225 100644
--- a/usr/src/uts/intel/sd/Makefile
+++ b/usr/src/uts/intel/sd/Makefile
@@ -138,7 +138,6 @@ SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
 
 WARLOCK_TARGETS = warlock_alone
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_mpt warlock_with_glm
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -154,28 +153,6 @@ $(WARLOCK_OK):	$(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \
 %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
 
-warlock_with_glm: $(WLCMD_DIR)/sd_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
-	glm_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_glm.wlcmd \
-		$(WARLOCK_OUT) \
-		$(CLOSED)/uts/intel/glm/*.ll \
-		 $(SCSI_FILES) $(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-warlock_with_mpt: $(WLCMD_DIR)/sd_with_mpt.wlcmd $(WARLOCK_OUT) scsi_files \
-	mpt_files warlock_ddi.files cmlb_files
-	$(WARLOCK) -c $(WLCMD_DIR)/sd_with_mpt.wlcmd \
-		$(WARLOCK_OUT) \
-		$(CLOSED)/uts/intel/mpt/*.ll \
-		$(SCSI_FILES) $(CMLB_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-
-glm_files:
-	@cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
-
-mpt_files:
-	@cd $(CLOSED)/uts/intel/mpt; pwd; $(MAKE) warlock
-
 cmlb_files:
 	@cd ../cmlb; pwd; $(MAKE) warlock
 
diff --git a/usr/src/uts/intel/ses/Makefile b/usr/src/uts/intel/ses/Makefile
index 0e51fd521e..f1b4243862 100644
--- a/usr/src/uts/intel/ses/Makefile
+++ b/usr/src/uts/intel/ses/Makefile
@@ -117,7 +117,6 @@ TEST		= test
 SCSI_FILES	= $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 
 WARLOCK_TARGETS	= $(WARLOCK_OK)
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_glm
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -135,19 +134,6 @@ $(WARLOCK_OK): $(WLCMD_DIR)/$(MODULE).wlcmd $(WARLOCK_OUT)
 %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 	$(WLCC) $(CPPFLAGS) -o $@ $<
 
-warlock_with_glm: $(WLCMD_DIR)/ses_with_glm.wlcmd $(WARLOCK_OUT) glm_files
-	@cd ../warlock; $(MAKE) warlock
-	@cd ../scsi; $(MAKE) warlock
-	@cd $(CLOSED)/uts/intel/glm; $(MAKE) warlock;
-	$(WARLOCK) -c $(WLCMD_DIR)/ses_with_glm.wlcmd ses.ll \
-		$(CLOSED)/uts/intel/glm/*.ll \
-	        $(SCSI_FILES) \
-		../warlock/scsi.ll \
-		-l ../warlock/ddi_dki_impl.ll 
-
-glm_files:
-	@cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
-
 warlock_ddi.files:
 	@cd ../warlock; pwd; $(MAKE) warlock
 
diff --git a/usr/src/uts/intel/st/Makefile b/usr/src/uts/intel/st/Makefile
index f629f4b70a..078d5a3796 100644
--- a/usr/src/uts/intel/st/Makefile
+++ b/usr/src/uts/intel/st/Makefile
@@ -126,7 +126,6 @@ TEST		= test
 SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 
 WARLOCK_TARGETS = warlock_alone
-$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_glm
 
 warlock: $(WARLOCK_TARGETS)
 
@@ -144,14 +143,6 @@ $(WARLOCK_OK): 	$(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) scsi_files \
 %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 	$(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
 
-warlock_with_glm: $(WLCMD_DIR)/st_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
-	glm_files warlock_ddi.files
-	$(WARLOCK) -c $(WLCMD_DIR)/st_with_glm.wlcmd \
-		$(WARLOCK_OUT) $(CLOSED)/uts/intel/glm/glm $(SCSI_FILES) \
-		-l ../warlock/ddi_dki_impl.ll
-glm_files:
-	@cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
-
 warlock_ddi.files:
 	@cd ../warlock; pwd; $(MAKE) warlock
 
diff --git a/usr/src/uts/intel/sys/Makefile b/usr/src/uts/intel/sys/Makefile
index d05dead3f6..192ada41a5 100644
--- a/usr/src/uts/intel/sys/Makefile
+++ b/usr/src/uts/intel/sys/Makefile
@@ -90,9 +90,6 @@ HDRS	=			\
 	x86_archext.h		\
 	xen_errno.h
 
-CLOSEDHDRS = \
-	memtest.h
-
 ROOTDIR=	$(ROOT)/usr/include/sys
 SCSIDIR=	$(ROOTDIR)/scsi
 SCSIDIRS=	$(SCSIDIR) $(SCSIDIR)/conf $(SCSIDIR)/generic \
@@ -101,20 +98,14 @@ ROOTFSDIR=	$(ROOTDIR)/fs
 ROOTDIRS=	$(ROOTDIR) $(ROOTFSDIR)
 
 ROOTHDRS= $(HDRS:%=$(ROOTDIR)/%)
-$(CLOSED_BUILD)ROOTHDRS += $(CLOSEDHDRS:%=$(ROOTDIR)/%)
 
 CHECKHDRS= 			\
 	$(HDRS:%.h=%.check)
 
-$(CLOSED_BUILD)CHECKHDRS += $(CLOSEDHDRS:%.h=$(CLOSED)/uts/intel/sys/%.check)
-
 # install rules
 $(ROOTDIR)/%: %
 	$(INS.file)
 
-$(ROOTDIR)/%:	$(CLOSED)/uts/intel/sys/%
-	$(INS.file)
-
 .KEEP_STATE:
 
 .PARALLEL: $(CHECKHDRS) $(ROOTHDRS)
diff --git a/usr/src/uts/intel/warlock/Makefile b/usr/src/uts/intel/warlock/Makefile
index 461a60bdf3..b109499204 100644
--- a/usr/src/uts/intel/warlock/Makefile
+++ b/usr/src/uts/intel/warlock/Makefile
@@ -81,16 +81,11 @@ warlock.usb:
 	@cd ../usbsacm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../usbecm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../usbskel; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/usbser_edge; \
-		$(MAKE) clean; $(MAKE) warlock
 
 warlock.scsi:
 	@cd ../sd; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ses; $(MAKE) clean; $(MAKE) warlock
 	@cd ../st; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/glm; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/mpt; $(MAKE) clean; $(MAKE) warlock
-
 
 warlock.1394:
 	@cd ../s1394; $(MAKE) clean; $(MAKE) warlock
@@ -107,17 +102,12 @@ warlock.ib:
 	@cd ../ibtl; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ibcm; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ibd; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/tavor; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/hermon; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/daplt; $(MAKE) clean; $(MAKE) warlock
 
 warlock.sata:
 	@cd ../sata; $(MAKE) clean; $(MAKE) warlock
 	@cd ../si3124; $(MAKE) clean; $(MAKE) warlock
 	@cd ../nv_sata; $(MAKE) clean; $(MAKE) warlock
 	@cd ../ahci; $(MAKE) clean; $(MAKE) warlock
-$(CLOSED_BUILD)	@cd $(CLOSED)/uts/intel/marvell88sx; \
-		$(MAKE) clean; $(MAKE) warlock
 
 warlock.wc:
 	@cd ../wc; $(MAKE) clean; $(MAKE) warlock