6745433 Merge NWS consolidation into OS/Net consolidation

32 files changed, 2947 insertions, 4 deletions

diff --git a/usr/src/uts/sparc/Makefile.files b/usr/src/uts/sparc/Makefile.files
index cfca9e03ba..285f1a3c56 100644
--- a/usr/src/uts/sparc/Makefile.files
+++ b/usr/src/uts/sparc/Makefile.files
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This Makefile defines all file modules and build rules for the
 # directory uts/sparc and it's children. These are the source files which
 # are specific to the sparc processor.
@@ -68,6 +66,7 @@ CPR_SPARC_OBJS +=	cpr_sparc.o
 PCI_PCI_OBJS +=		pci_pci.o pci_debug.o pci_pwr.o pcix.o
 PX_PCI_OBJS +=		px_pci.o pcie_pwr.o
 FCODE_OBJS +=		fcode.o
+NSKERN_OBJS +=		nsc_asm.o
 
 #
 #			file system modules
diff --git a/usr/src/uts/sparc/Makefile.rules b/usr/src/uts/sparc/Makefile.rules
index a9ab9e0dba..6940742101 100644
--- a/usr/src/uts/sparc/Makefile.rules
+++ b/usr/src/uts/sparc/Makefile.rules
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This Makefile defines all file modules and build rules for the
 # directory uts/sparc and its children. These are the source files which
 # are specific to the sparc processor.
@@ -80,6 +78,9 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/sparc/krtld/%.s
 $(OBJS_DIR)/%.o:		$(UTSBASE)/sparc/ml/%.s
 	$(COMPILE.s) -o $@ $<
 
+$(OBJS_DIR)/%.o:		$(UTSBASE)/sparc/nskern/%.s
+	$(COMPILE.s) -o $@ $<
+
 $(OBJS_DIR)/%.o:		$(UTSBASE)/sparc/os/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
@@ -122,6 +123,9 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/sparc/krtld/%.s
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sparc/ml/%.s
 	@($(LHEAD) $(LINT.s) $< $(LTAIL))
 
+$(LINTS_DIR)/%.ln:		$(UTSBASE)/sparc/nskern/%.s
+	@($(LHEAD) $(LINT.s) $< $(LTAIL))
+
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sparc/os/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared
index 6644b73a2b..8f52723273 100644
--- a/usr/src/uts/sparc/Makefile.sparc.shared
+++ b/usr/src/uts/sparc/Makefile.sparc.shared
@@ -235,6 +235,7 @@ $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= glm
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= isp
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= llc2
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= mpt
+$(CLOSED_BUILD)CLOSED_DRV_KMODS += qus
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= se
 $(CLOSED_BUILD)CLOSED_DRV_KMODS += rtls
 
@@ -279,11 +280,24 @@ DRV_KMODS	+= sgen
 DRV_KMODS	+= smp
 DRV_KMODS	+= dad
 DRV_KMODS	+= scsi_vhci
+DRV_KMODS	+= fcp
+DRV_KMODS	+= fcip
+DRV_KMODS	+= fcsm
+DRV_KMODS	+= fp
+DRV_KMODS	+= qlc
 DRV_KMODS	+= sdcard
 DRV_KMODS	+= sdhost
 DRV_KMODS	+= wbsd
 DRV_KMODS	+= dda
 DRV_KMODS	+= dmd
+DRV_KMODS	+= stmf
+DRV_KMODS	+= stmf_sbd
+DRV_KMODS	+= fct
+DRV_KMODS	+= qlt
+DRV_KMODS	+= ncall nsctl sdbc nskern sv
+DRV_KMODS	+= ii rdc rdcsrv rdcstub 
+DRV_KMODS	+= iscsi
+DRV_KMODS	+= emlxs
 
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= audioens
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= audiovia823x
@@ -384,8 +398,11 @@ MISC_KMODS	+= pcicfg.e fcodem fcpci
 MISC_KMODS	+= scsi_vhci_f_sym scsi_vhci_f_tpgs scsi_vhci_f_asym_sun
 MISC_KMODS	+= scsi_vhci_f_sym_hds
 MISC_KMODS	+= scsi_vhci_f_tape scsi_vhci_f_tpgs_tape
+MISC_KMODS	+= fctl
+MISC_KMODS	+= qlc_fw_2200 qlc_fw_2300 qlc_fw_2400 qlc_fw_2500 qlc_fw_6322
 MISC_KMODS	+= blk2scsa
 MISC_KMODS	+= sda
+MISC_KMODS	+= spuni
 
 $(CLOSED_BUILD)CLOSED_MISC_KMODS	+= amsrc1
 $(CLOSED_BUILD)CLOSED_MISC_KMODS	+= klmmod klmops
diff --git a/usr/src/uts/sparc/emlxs/Makefile b/usr/src/uts/sparc/emlxs/Makefile
new file mode 100644
index 0000000000..92a5816fe2
--- /dev/null
+++ b/usr/src/uts/sparc/emlxs/Makefile
@@ -0,0 +1,125 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	This makefile drives the production of the fct driver for 
+#	COMSTAR.
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE		= ../../
+COMMON_BASE	= ../../../common
+
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= emlxs
+OBJECTS		= $(EMLXS_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(EMLXS_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/fca/emlxs
+
+#
+#	Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+BUILD_DATE:sh            = date +%\Y%m%d
+BUILD_DATE_TIME:sh       = date +%Y.%m.%d.%H.%M
+
+EMLXS_FLAGS             = -DEMLXS_SPARC
+EMLXS_FLAGS             += -DS11
+EMLXS_FLAGS             += -DVERSION=\"11\"
+EMLXS_FLAGS             += -DMACH=\"$(MACH)\"
+EMLXS_CFLAGS            = $(EMLXS_FLAGS)
+EMLXS_LFLAGS            = $(EMLXS_FLAGS)
+CFLAGS	                += $(EMLXS_CFLAGS) -DEMLXS_ARCH=\"64\"
+LINTTAGS                += $(EMLXS_LFLAGS) -DEMLXS_ARCH=\"64\"
+
+
+#
+#	Overrides and depends_on
+#
+MODSTUBS_DIR	 = $(OBJS_DIR)
+
+INC_PATH	+= -I$(ROOT)/usr/include
+INC_PATH	+= -I$(UTSBASE)/common/io/fibre-channel/fca/emlxs
+INC_PATH	+= -I$(UTSBASE)/common/sys
+INC_PATH	+= -I$(COMMON_BASE)/bignum
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/impl
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/ulp
+
+LDFLAGS		+= -dy -Nmisc/md5 -Nmisc/sha1
+LDFLAGS		+= -Nmisc/bignum
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
+LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
+LINTTAGS	+= -erroff=E_INCONS_VAL_TYPE_DECL2
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/fcip/Makefile b/usr/src/uts/sparc/fcip/Makefile
new file mode 100644
index 0000000000..ebda0210fc
--- /dev/null
+++ b/usr/src/uts/sparc/fcip/Makefile
@@ -0,0 +1,101 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# uts/sparc/fcip/Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This makefile drives the production of fcip driver kernel module.
+#
+# i86pc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= fcip
+OBJECTS		= $(FCIP_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(FCIP_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/ulp/
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	header file directories
+#
+INC_PATH	+= -I$(SRC)/uts/common
+
+LDFLAGS		+= -dy -Nmisc/fctl -Ndrv/ip
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
+LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS	+= -erroff=E_INCONS_ARG_USED2
+LINTTAGS	+= -erroff=E_INCONS_VAL_TYPE_USED2
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+warlock:
+	@echo warlock is not supported
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/fcp/Makefile b/usr/src/uts/sparc/fcp/Makefile
new file mode 100644
index 0000000000..7c27582eac
--- /dev/null
+++ b/usr/src/uts/sparc/fcp/Makefile
@@ -0,0 +1,99 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# uts/sparc/fcp/Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This makefile drives the production of fcp driver kernel module.
+#
+# i86pc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= fcp
+OBJECTS		= $(FCP_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(FCP_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR     = $(UTSBASE)/common/io/fibre-channel/ulp/
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	header file directories
+#
+INC_PATH	+= -I$(ROOT)/usr/include
+
+LDFLAGS		+= -dy -Nmisc/fctl -Nmisc/scsi
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+warlock:
+	@echo warlock is not supported
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/fcsm/Makefile b/usr/src/uts/sparc/fcsm/Makefile
new file mode 100644
index 0000000000..1bb8c9c7ab
--- /dev/null
+++ b/usr/src/uts/sparc/fcsm/Makefile
@@ -0,0 +1,97 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# uts/sparc/fcsm/Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This makefile drives the production of fcsm driver kernel module.
+#
+# i86pc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= fcsm
+OBJECTS		= $(FCSM_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(FCSM_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/ulp/
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	header file directories
+#
+INC_PATH	+= -I$(ROOT)/usr/include
+
+LDFLAGS		+= -dy -Nmisc/fctl
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+warlock:
+	@echo warlock is not supported
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/fct/Makefile b/usr/src/uts/sparc/fct/Makefile
new file mode 100644
index 0000000000..24e0d9113a
--- /dev/null
+++ b/usr/src/uts/sparc/fct/Makefile
@@ -0,0 +1,102 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	This makefile drives the production of the fct driver for 
+#	COMSTAR.
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+
+
+UTSBASE	= ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= fct
+OBJECTS		= $(FCT_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(FCT_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/comstar/port/fct
+
+#
+#	Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	Overrides and depends_on
+#
+MODSTUBS_DIR	 = $(OBJS_DIR)
+LDFLAGS		+= -dy -Ndrv/stmf
+
+INC_PATH	+= -I$(UTSBASE)/common/io/comstar/port/fct
+INC_PATH	+= -I$(UTSBASE)/common/sys
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS	+= -erroff=E_IF_ELSE_ANNOTATION
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/fctl/Makefile b/usr/src/uts/sparc/fctl/Makefile
new file mode 100644
index 0000000000..fa8573764b
--- /dev/null
+++ b/usr/src/uts/sparc/fctl/Makefile
@@ -0,0 +1,96 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# uts/sparc/fctl/Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)Makefile 1.10	08/07/25 SMI"
+#
+# This makefile drives the production of fctl driver kernel module.
+#
+# i86pc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= fctl
+OBJECTS		= $(FCTL_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(FCTL_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+#
+#	header file directories
+#
+INCS		+= -I$(SRC)/uts/common/
+
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/fp/Makefile b/usr/src/uts/sparc/fp/Makefile
new file mode 100644
index 0000000000..34d7c25654
--- /dev/null
+++ b/usr/src/uts/sparc/fp/Makefile
@@ -0,0 +1,99 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# uts/sparc/fp/Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)Makefile 1.10	08/07/25 SMI"
+#
+# This makefile drives the production of fp driver kernel module.
+#
+# i86pc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= fp
+OBJECTS		= $(FP_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(FP_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR     = $(UTSBASE)/sparc/io/fibre-channel/impl/
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	header file directories
+#
+INCS 		+= -I$(SRC)/uts/common/
+
+LDFLAGS		+= -dy -Nmisc/fctl -Ndrv/fcp -Nmisc/scsi
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/ii/Makefile b/usr/src/uts/sparc/ii/Makefile
new file mode 100644
index 0000000000..a74651f50c
--- /dev/null
+++ b/usr/src/uts/sparc/ii/Makefile
@@ -0,0 +1,92 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/ii/Makefile
+#
+#       This makefile drives the production of the ii kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= ii
+OBJECTS		= $(DSW_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(DSW_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+INC_PATH	+= -I$(ROOT)/usr/include
+CONF_SRCDIR	= $(UTSBASE)/common/avs/ns/dsw
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v
+LDFLAGS += -dy -N"drv/nsctl" -N"drv/nskern" -N"misc/spuni"
+LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
+
diff --git a/usr/src/uts/sparc/io/fibre-channel/impl/fp.conf b/usr/src/uts/sparc/io/fibre-channel/impl/fp.conf
new file mode 100644
index 0000000000..21e7f6f805
--- /dev/null
+++ b/usr/src/uts/sparc/io/fibre-channel/impl/fp.conf
@@ -0,0 +1,97 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# Sun Fibre Channel Port driver configuration
+#
+#
+
+name="fp" class="fibre-channel" port=0;
+name="fp" class="fibre-channel" port=1;
+
+#
+# Automatic configuration of the fabric is turned on by default
+# and thus allows all devices discovered in the SAN zone to be
+# enumerated in the Solaris devinfo tree automatically.
+#
+# The manual_configuration_only property may be used to
+# disable the default behavior and force the manual configuration of
+# the devices in the SAN. Setting manual_configuration_only=1
+# will disable the automatic configuration of devices.
+# NOTE: Use of this property is not recommended. If used, the
+# fabric devices accessed at boot time need to get manually configured
+# before the next reboot. Otherwise, fabric devices that are needed at
+# boot time may not get configured and may cause boot problems.
+# To manually configure fabric devices, refer to cfgadm_fp(1M).
+# manual_configuration_only=1;
+#
+
+#
+# To generate the binding-set specific 'compatible' forms used to address
+# legacy issues the 'scsi-binding-set' property must be defined. (do not remove)
+#
+scsi-binding-set="fcp";
+
+#
+# List of ULP modules for loading during port driver attach time
+#
+load-ulp-list="1","fcp";
+
+#
+# I/O multipathing feature (MPxIO) can be enabled or disabled using
+# mpxio-disable property. Setting mpxio-disable="no" will activate
+# I/O multipathing; setting mpxio-disable="yes" disables the feature.
+#
+# Global mpxio-disable property:
+#
+# To globally enable MPxIO on all fp ports set:
+# mpxio-disable="no";
+#
+# To globally disable MPxIO on all fp ports set:
+# mpxio-disable="yes";
+#
+# Per port mpxio-disable property:
+#
+# You can also enable or disable MPxIO on a per port basis.
+# Per port settings override the global setting for the specified ports.
+# To disable MPxIO on port 0 whose parent is /pci@8,600000/SUNW,qlc@4 set:
+# name="fp" parent="/pci@8,600000/SUNW,qlc@4" port=0 mpxio-disable="yes";
+#
+# NOTE: If you just want to enable or disable MPxIO on all fp ports, it is
+# better to use stmsboot(1M) as it also updates /etc/vfstab.
+#
+mpxio-disable="yes";
+#
+# You can describe a list of target port WWNs and LUN numbers which will
+# not be configured. LUN numbers will be interpreted as decimal. White
+# spaces and ',' can be used in the list of LUN numbers.
+#
+# pwwn-lun-blacklist=
+# "target-port-wwn,lun-list"
+#
+# To prevent LUNs 1 and 2 from being configured for target
+# port 510000f010fd92a1 and target port 510000e012079df1, set:
+#
+# pwwn-lun-blacklist=
+# "510000f010fd92a1,1,2",
+# "510000e012079df1,1,2";
diff --git a/usr/src/uts/sparc/iscsi/Makefile b/usr/src/uts/sparc/iscsi/Makefile
new file mode 100644
index 0000000000..0e35ba9d0d
--- /dev/null
+++ b/usr/src/uts/sparc/iscsi/Makefile
@@ -0,0 +1,93 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# This makefile drives the production of iSCSI initiator Driver
+# sparc architecture dependent
+#
+
+#
+#	Paths to the base of the uts directory trees
+#
+UTSBASE   = ../..
+
+#
+# Define the module and object file sets.
+#
+MODULE		= iscsi
+OBJECTS		= $(ISCSI_INITIATOR_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(ISCSI_INITIATOR_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/scsi/adapters/iscsi
+
+#
+# Include common rules.
+#
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+# Define targets.
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+# includes
+INC_PATH	+= -I$(UTSBASE)/common/io/scsi/adapters/iscsi
+
+#
+# Note dependancy on misc/scsi.
+#
+LDFLAGS += -dy -N"misc/scsi" -N"fs/sockfs" -N"sys/doorfs" -N"misc/md5"
+
+LINTFLAGS += -a -erroff=E_BAD_PTR_CAST_ALIGN -erroff=E_PTRDIFF_OVERFLOW
+LINTFLAGS64 += -a -erroff=E_BAD_PTR_CAST_ALIGN -erroff=E_PTRDIFF_OVERFLOW
+
+#
+# Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+# Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/ncall/Makefile b/usr/src/uts/sparc/ncall/Makefile
new file mode 100644
index 0000000000..99d4b27288
--- /dev/null
+++ b/usr/src/uts/sparc/ncall/Makefile
@@ -0,0 +1,89 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/ncall/Makefile
+#
+#       This makefile drives the production of the ncall kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= ncall
+OBJECTS		= $(NCALL_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(NCALL_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+INC_PATH	+= -I$(ROOT)/usr/include
+CONF_SRCDIR	= $(UTSBASE)/common/avs/ncall
+
+#
+#       Include common rules.
+#
+include $(UTSBASE)/sparc/Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v -D_SYSCALL32
+LINT_DEFS += -D_SYSCALL32
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/nsctl/Makefile b/usr/src/uts/sparc/nsctl/Makefile
new file mode 100644
index 0000000000..116a30c844
--- /dev/null
+++ b/usr/src/uts/sparc/nsctl/Makefile
@@ -0,0 +1,93 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/nsctl/Makefile
+#
+#       This makefile drives the production of the nsctl kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= nsctl
+OBJECTS		= $(NSCTL_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(NSCTL_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+INC_PATH	+= -I$(UTSBASE)/common/avs
+INC_PATH	+= -I$(ROOT)/usr/include
+CONF_SRCDIR	= $(UTSBASE)/common/avs/ns/nsctl
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v
+LDFLAGS += -dy -N"drv/nskern" -N"drv/ncall" -N"misc/spuni"
+LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/nskern/Makefile b/usr/src/uts/sparc/nskern/Makefile
new file mode 100644
index 0000000000..b591f6df63
--- /dev/null
+++ b/usr/src/uts/sparc/nskern/Makefile
@@ -0,0 +1,89 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/nskern/Makefile
+#
+#       This makefile drives the production of the nskern kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= nskern
+OBJECTS		= $(NSKERN_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(NSKERN_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+INC_PATH	+= -I$(UTSBASE)/common/avs
+INC_PATH	+= -I$(ROOT)/usr/include
+CONF_SRCDIR	= $(UTSBASE)/common/avs/ns/solaris
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/nskern/nsc_asm.s b/usr/src/uts/sparc/nskern/nsc_asm.s
new file mode 100644
index 0000000000..04463728be
--- /dev/null
+++ b/usr/src/uts/sparc/nskern/nsc_asm.s
@@ -0,0 +1,150 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#if defined(lint) || defined(DS_DDICT)
+#include <sys/types.h>
+#include <sys/param.h>
+#else
+#include <sys/asm_linkage.h>
+#endif
+
+#ifdef DS_DDICT
+#define	uint8_t	uchar_t
+#endif
+
+
+/*
+ * Special support routines that can't be done with C
+ */
+
+
+/*
+ * uint8_t nsc_ldstub(uint8_t *cp)
+ *
+ * Store 0xFF at the specified location, and return its previous content.
+ */
+
+#if defined(lint) || defined(DS_DDICT)
+uint8_t
+nsc_ldstub(uint8_t *cp)
+{
+	uint8_t rv;
+	rv = *cp;
+	*cp = 0xFF;
+	return (rv);
+}
+#else
+
+	ENTRY(nsc_ldstub)
+	retl
+	ldstub	[%o0], %o0
+	SET_SIZE(nsc_ldstub)
+
+#endif	/* lint || DS_DDICT */
+
+
+/*
+ * nsc_membar_stld(void)
+ *
+ * C callable interface to SPARC asm membar instruction.
+ */
+
+#if defined(lint) || defined(DS_DDICT)
+void
+nsc_membar_stld(void)
+{}
+#else
+
+	ENTRY(nsc_membar_stld)
+	retl
+	membar	#StoreLoad
+	SET_SIZE(nsc_membar_stld)
+
+#endif	/* lint || DS_DDICT */
+
+
+/*
+ * if a() calls b() calls nsc_caller(),
+ * nsc_caller() returns return address in a().
+ */
+
+#if defined(lint) || defined(DS_DDICT)
+caddr_t
+nsc_caller(void)
+{
+	return (0);
+}
+#else
+
+	ENTRY(nsc_caller)
+	retl
+	mov	%i7, %o0
+	SET_SIZE(nsc_caller)
+
+#endif  /* lint || DS_DDICT */
+
+
+/*
+ * if a() calls nsc_callee(), nsc_callee() returns the
+ * return address in a();
+ */
+
+#if defined(lint) || defined(DS_DDICT)
+caddr_t
+nsc_callee(void)
+{
+	return (0);
+}
+#else
+
+	ENTRY(nsc_callee)
+	.register %g7, #scratch
+	retl
+	mov	%o7, %o0
+	SET_SIZE(nsc_callee)
+
+#endif  /* lint || DS_DDICT */
+
+
+/*
+ * nsc_threadp(void)
+ *
+ * C callable interface to get the current thread pointer.
+ */
+
+#if defined(lint) || defined(DS_DDICT)
+void *
+nsc_threadp(void)
+{
+       return (NULL);
+}
+#else
+
+       ENTRY(nsc_threadp)
+       retl
+       mov %g7, %o0
+       SET_SIZE(nsc_threadp)
+
+#endif /* lint || DS_DDICT */
diff --git a/usr/src/uts/sparc/qlc/Makefile b/usr/src/uts/sparc/qlc/Makefile
new file mode 100644
index 0000000000..fe1fa4bdd0
--- /dev/null
+++ b/usr/src/uts/sparc/qlc/Makefile
@@ -0,0 +1,123 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)Makefile 1.10	08/07/25 SMI"
+#
+# This makefile drives the production of fcp driver kernel module.
+#
+# i86pc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= qlc
+OBJECTS		= $(QLC_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(QLC_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/fca/qlc
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	header file directories
+#
+INC_PATH	+= -I$(ROOT)/usr/include
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/ulp
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/fca
+INC_PATH	+= -I$(UTSBASE)/common/sys/fibre-channel/impl
+
+LDFLAGS		+= -dy -Nmisc/fctl
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
+
+FWTABLE          = ql_fw_table.c
+FWIMAGES         = 2200
+FWIMAGES        += 2300
+FWIMAGES        += 2400
+FWIMAGES        += 2500
+FWIMAGES        += 6322
+
+FWMODULES        = $(FWIMAGES:%=$(MODULE)_fw_%)
+FWMODULES_SRC    = $(FWIMAGES:%=$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_%.c)
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+all:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(ALL_DEPS)
+
+def:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(DEF_DEPS)
+
+clean:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS)
+
+clobber:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS)
+
+lint:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS)
+
+modlintlib:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS)
+
+clean.lint:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS)
+
+install:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS)
+
+$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c: $(FWMODULES_SRC)
+	/usr/bin/rm -f $@
+	echo '#include <ql_apps.h>'             >> $@
+	echo '#include <ql_api.h>'              >> $@
+	echo 'struct fw_table fw_table[] = {'   >> $@
+	grep FW_VERSION_STRING $(FWMODULES_SRC) |\
+	grep '#define'                          |\
+	sed 's/[0-9]"/& },/'                    |\
+	sed 's/.*ql_fw_/{ 0x/'                  |\
+	sed 's/.c:#define/,/'                   |\
+	sed 's/FW_VERSION_STRING//'             >> $@
+	echo '};'                               >> $@
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/qlc_fw_2200/Makefile b/usr/src/uts/sparc/qlc_fw_2200/Makefile
new file mode 100644
index 0000000000..ea58523440
--- /dev/null
+++ b/usr/src/uts/sparc/qlc_fw_2200/Makefile
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This makefile drives the production of qlc driver kernel module.
+#
+# sparc rchitecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= qlc_fw_2200
+OBJECTS		= $(QLC_FW_2200_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(QLC_FW_2200_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_QLC_FW_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/fca/qlc
+
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+LDFLAGS		+= -dy -Nmisc/fctl
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -DUNIQUE_FW_NAME
+LINTTAGS	+= -DFW_VERSION_STRING=\"2.01.145\"
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/qlc_fw_2300/Makefile b/usr/src/uts/sparc/qlc_fw_2300/Makefile
new file mode 100644
index 0000000000..cf634ed0b8
--- /dev/null
+++ b/usr/src/uts/sparc/qlc_fw_2300/Makefile
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This makefile drives the production of qlc driver kernel module.
+#
+# sparc rchitecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= qlc_fw_2300
+OBJECTS		= $(QLC_FW_2300_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(QLC_FW_2300_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_QLC_FW_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/fca/qlc
+
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+LDFLAGS		+= -dy -Nmisc/fctl
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -DUNIQUE_FW_NAME
+LINTTAGS	+= -DFW_VERSION_STRING=\"3.03.27\"
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/qlc_fw_2400/Makefile b/usr/src/uts/sparc/qlc_fw_2400/Makefile
new file mode 100644
index 0000000000..78a03509c6
--- /dev/null
+++ b/usr/src/uts/sparc/qlc_fw_2400/Makefile
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This makefile drives the production of qlc driver kernel module.
+#
+# sparc rchitecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= qlc_fw_2400
+OBJECTS		= $(QLC_FW_2400_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(QLC_FW_2400_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_QLC_FW_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/fca/qlc
+
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+LDFLAGS		+= -dy -Nmisc/fctl
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -DUNIQUE_FW_NAME
+LINTTAGS	+= -DFW_VERSION_STRING=\"4.04.01\"
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/qlc_fw_2500/Makefile b/usr/src/uts/sparc/qlc_fw_2500/Makefile
new file mode 100644
index 0000000000..106a527fa4
--- /dev/null
+++ b/usr/src/uts/sparc/qlc_fw_2500/Makefile
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This makefile drives the production of qlc driver kernel module.
+#
+# sparc rchitecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= qlc_fw_2500
+OBJECTS		= $(QLC_FW_2500_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(QLC_FW_2500_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_QLC_FW_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/fca/qlc
+
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+LDFLAGS		+= -dy -Nmisc/fctl
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -DUNIQUE_FW_NAME
+LINTTAGS	+= -DFW_VERSION_STRING=\"4.04.01\"
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/qlc_fw_6322/Makefile b/usr/src/uts/sparc/qlc_fw_6322/Makefile
new file mode 100644
index 0000000000..344bbe1875
--- /dev/null
+++ b/usr/src/uts/sparc/qlc_fw_6322/Makefile
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This makefile drives the production of qlc driver kernel module.
+#
+# sparc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= qlc_fw_6322
+OBJECTS		= $(QLC_FW_6322_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(QLC_FW_6322_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_QLC_FW_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/fibre-channel/fca/qlc
+
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/Makefile.uts
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(CONFMOD) $(ITUMOD)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+LDFLAGS		+= -dy -Nmisc/fctl
+
+#
+#	Lint tags
+#
+LINTTAGS	+= -DUNIQUE_FW_NAME
+LINTTAGS	+= -DFW_VERSION_STRING=\"3.03.27\"
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/qlt/Makefile b/usr/src/uts/sparc/qlt/Makefile
new file mode 100644
index 0000000000..27ae967bde
--- /dev/null
+++ b/usr/src/uts/sparc/qlt/Makefile
@@ -0,0 +1,102 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	This makefile drives the production of the qlt driver for 
+#	COMSTAR.
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= qlt
+OBJECTS		= $(QLT_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(QLT_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/comstar/port/qlt
+
+#
+#	Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	Overrides and depends_on
+#
+MODSTUBS_DIR	 = $(OBJS_DIR)
+LDFLAGS		+= -dy -Ndrv/fct -Ndrv/stmf
+CFLAGS		+= -DUNIQUE_FW_NAME
+
+INC_PATH	+= -I$(UTSBASE)/common/io/comstar/port/qlt
+INC_PATH	+= -I$(UTSBASE)/common/sys
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+#
+LINTTAGS	+= -DUNIQUE_FW_NAME
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
+LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/rdc/Makefile b/usr/src/uts/sparc/rdc/Makefile
new file mode 100644
index 0000000000..dc20fcd5a8
--- /dev/null
+++ b/usr/src/uts/sparc/rdc/Makefile
@@ -0,0 +1,101 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/rdc/Makefile
+#
+#       This makefile drives the production of the rdc kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= rdc
+OBJECTS		= $(RDC_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(RDC_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+INC_PATH	+= -I$(ROOT)/usr/include
+CONF_SRCDIR	= $(UTSBASE)/common/avs/ns/rdc
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+	
+#
+# lint pass one enforcement
+#
+CFLAGS += -v -D_SD_8K_BLKSIZE -D_SYSCALL32
+LINT_DEFS += -D_SYSCALL32
+LINTTAGS  += -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS  += -erroff=E_INCONS_ARG_DECL2
+LDFLAGS += -dy -N"drv/nsctl" -N"drv/nskern" -N"drv/ncall" -N"misc/spuni" \
+	-N"misc/rdcsrv" -N"strmod/rpcmod"
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+		-rm -f obj*/rdc_prot_xdr.c debug*/rdc_prot_xdr.c
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+$(OBJS_DIR)/rdc_prot_xdr.c:	$(UTSBASE)/common/avs/ns/rdc/rdc_prot.x
+	$(RPCGEN) -i 0 -C -c -o $@ \
+		`/bin/pwd`/$(UTSBASE)/common/avs/ns/rdc/rdc_prot.x
+
+$(OBJS_DIR)/rdc_prot_xdr.o:	$(OBJS_DIR)/rdc_prot_xdr.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/rdc_prot_xdr.c
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/rdcsrv/Makefile b/usr/src/uts/sparc/rdcsrv/Makefile
new file mode 100644
index 0000000000..a1e7a619a4
--- /dev/null
+++ b/usr/src/uts/sparc/rdcsrv/Makefile
@@ -0,0 +1,89 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/rdcsrv/Makefile
+#
+#       This makefile drives the production of the rdcsrv kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= rdcsrv
+OBJECTS		= $(RDCSRV_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(RDCSRV_OBJS:%.o=$(LINTS_DIR)/%.ln)
+INC_PATH	+= -I$(ROOT)/usr/include
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v -D_SD_8K_BLKSIZE -D_SYSCALL32
+LINT_DEFS += -D_SD_8K_BLKSIZE -D_SYSCALL32
+LDFLAGS += -dy -N"strmod/rpcmod" -N"misc/rdcstub"
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/rdcstub/Makefile b/usr/src/uts/sparc/rdcstub/Makefile
new file mode 100644
index 0000000000..d26dfeffdc
--- /dev/null
+++ b/usr/src/uts/sparc/rdcstub/Makefile
@@ -0,0 +1,89 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/rdcstub/Makefile
+#
+#       This makefile drives the production of the rdcsrv kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= rdcstub
+OBJECTS		= $(RDCSTUB_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(RDCSTUB_OBJS:%.o=$(LINTS_DIR)/%.ln)
+INC_PATH	+= -I$(ROOT)/usr/include
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v -D_SD_8K_BLKSIZE -D_SYSCALL32
+LINT_DEFS += -D_SD_8K_BLKSIZE -D_SYSCALL32
+LDFLAGS += -dy -N"strmod/rpcmod"
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/sdbc/Makefile b/usr/src/uts/sparc/sdbc/Makefile
new file mode 100644
index 0000000000..bf1c0459d0
--- /dev/null
+++ b/usr/src/uts/sparc/sdbc/Makefile
@@ -0,0 +1,168 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# uts/sparc/sdbc/Makefile
+#
+#       This makefile drives the production of the sdbc kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+UTSCOMMON = $(UTSBASE)/common
+AVSCOMMON = $(UTSCOMMON)/avs
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= sdbc
+OBJECTS		= $(SDBC_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(SDBC_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+INC_PATH	+= -I$(ROOT)/usr/include
+INC_PATH	+= -I$(AVSCOMMON)
+INC_PATH	+= -I$(AVSCOMMON)/ns/sdbc
+CONF_SRCDIR	= $(UTSBASE)/common/avs/ns/sdbc
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+CLOBBERFILES += obj*/*.c debug*/*.c obj*/sd_mkiob debug*/sd_mkiob
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v -D_SD_8K_BLKSIZE -D_SDBC_SINGLE_BRD
+LDFLAGS += -dy -N"drv/nsctl" -N"drv/ncall" -N"drv/nskern" -N"misc/spuni"
+LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+$(OBJS_DIR)/sd_mkiob:		$(UTSBASE)/common/avs/ns/sdbc/sd_mkiob.sh
+	$(CP) $(UTSBASE)/common/avs/ns/sdbc/sd_mkiob.sh $@
+	$(CHMOD) 755 $@
+
+$(OBJS_DIR)/sd_iob_impl0.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 0 512 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl1.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 512 1024 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl2.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 1024 1536 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl3.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 1536 2048 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl4.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 2048 2560 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl5.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 2560 3072 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl6.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 3072 3584 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl7.c:	$(UTSBASE)/common/avs/ns/sdbc/sd_iob.h \
+				$(OBJS_DIR)/sd_mkiob
+	$(OBJS_DIR)/sd_mkiob 3584 9999 $(AVSCOMMON)/ns/sdbc/sd_iob.h > $@
+
+$(OBJS_DIR)/sd_iob_impl0.o:	$(OBJS_DIR)/sd_iob_impl0.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl0.c
+	$(POST_PROCESS_O)
+
+$(OBJS_DIR)/sd_iob_impl1.o:	$(OBJS_DIR)/sd_iob_impl1.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl1.c
+	$(POST_PROCESS_O)
+
+$(OBJS_DIR)/sd_iob_impl2.o:	$(OBJS_DIR)/sd_iob_impl2.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl2.c
+	$(POST_PROCESS_O)
+
+$(OBJS_DIR)/sd_iob_impl3.o:	$(OBJS_DIR)/sd_iob_impl3.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl3.c
+	$(POST_PROCESS_O)
+
+$(OBJS_DIR)/sd_iob_impl4.o:	$(OBJS_DIR)/sd_iob_impl4.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl4.c
+	$(POST_PROCESS_O)
+
+$(OBJS_DIR)/sd_iob_impl5.o:	$(OBJS_DIR)/sd_iob_impl5.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl5.c
+	$(POST_PROCESS_O)
+
+$(OBJS_DIR)/sd_iob_impl6.o:	$(OBJS_DIR)/sd_iob_impl6.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl6.c
+	$(POST_PROCESS_O)
+
+$(OBJS_DIR)/sd_iob_impl7.o:	$(OBJS_DIR)/sd_iob_impl7.c
+	$(COMPILE.c) -o $@ $(OBJS_DIR)/sd_iob_impl7.c
+	$(POST_PROCESS_O)
+
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/spuni/Makefile b/usr/src/uts/sparc/spuni/Makefile
new file mode 100644
index 0000000000..3147e7a3b9
--- /dev/null
+++ b/usr/src/uts/sparc/spuni/Makefile
@@ -0,0 +1,88 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/spuni/Makefile
+#
+#       This makefile drives the production of the spuni kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= spuni
+OBJECTS		= $(UNISTAT_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(UNISTAT_OBJS:%.o=$(LINTS_DIR)/%.ln)
+INC_PATH	+= -I$(ROOT)/usr/include
+ROOTMODULE      = $(USR_MISC_DIR)/$(MODULE)
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) 
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) 
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v
+LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/stmf/Makefile b/usr/src/uts/sparc/stmf/Makefile
new file mode 100644
index 0000000000..044f3eeb8a
--- /dev/null
+++ b/usr/src/uts/sparc/stmf/Makefile
@@ -0,0 +1,99 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	This makefile drives the production of the stmf driver for 
+#	COMSTAR.
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= stmf
+OBJECTS		= $(STMF_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(STMF_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/comstar/stmf
+
+#
+#	Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	Overrides and depends_on
+#
+MODSTUBS_DIR	 = $(OBJS_DIR)
+CERRWARN	+= -erroff=E_STATEMENT_NOT_REACHED
+
+INC_PATH	+= -I$(UTSBASE)/common/io/comstar/stmf
+INC_PATH	+= -I$(UTSBASE)/common/sys
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/stmf_sbd/Makefile b/usr/src/uts/sparc/stmf_sbd/Makefile
new file mode 100644
index 0000000000..effc2cf0c2
--- /dev/null
+++ b/usr/src/uts/sparc/stmf_sbd/Makefile
@@ -0,0 +1,98 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	This makefile drives the production of the stmf_sbd driver for 
+#	COMSTAR.
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= stmf_sbd
+OBJECTS		= $(STMF_SBD_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(STMF_SBD_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/common/io/comstar/lu/stmf_sbd
+
+#
+#	Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+#	Overrides and depends_on
+#
+MODSTUBS_DIR	 = $(OBJS_DIR)
+LDFLAGS		+= -dy -Ndrv/stmf
+
+INC_PATH	+= -I$(UTSBASE)/common/io/comstar/lu/stmf_sbd
+INC_PATH	+= -I$(UTSBASE)/common/sys
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ
diff --git a/usr/src/uts/sparc/sv/Makefile b/usr/src/uts/sparc/sv/Makefile
new file mode 100644
index 0000000000..9499f5d5d9
--- /dev/null
+++ b/usr/src/uts/sparc/sv/Makefile
@@ -0,0 +1,89 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# uts/sparc/sv/Makefile
+#
+#       This makefile drives the production of the sv kernel module
+#
+#       sparc implementation architecture dependent
+#
+
+#
+#       Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+#
+UTSBASE = ../..
+
+ARCHDIR:sh = cd ..; basename `pwd`
+
+#
+#       Define the module and object file sets.
+#
+MODULE		= sv
+OBJECTS		= $(SV_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(SV_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE      = $(USR_DRV_DIR)/$(MODULE)
+INC_PATH	+= -I$(ROOT)/usr/include
+CONF_SRCDIR	= $(UTSBASE)/common/avs/ns/sv
+
+#
+#       Include common rules.
+#
+include ../Makefile.$(ARCHDIR)
+include $(UTSBASE)/common/avs/Makefile.com
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += -v
+LDFLAGS += -dy -N"drv/nsctl" -N"drv/nskern" -N"misc/spuni"
+
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include ../Makefile.targ