summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/intel')
-rw-r--r--usr/src/uts/intel/Makefile.intel5
-rw-r--r--usr/src/uts/intel/ii/Makefile95
-rw-r--r--usr/src/uts/intel/ncall/Makefile89
-rw-r--r--usr/src/uts/intel/nsctl/Makefile95
-rw-r--r--usr/src/uts/intel/nskern/Makefile97
-rw-r--r--usr/src/uts/intel/nskern/nsc_asm.s189
-rw-r--r--usr/src/uts/intel/rdc/Makefile108
-rw-r--r--usr/src/uts/intel/rdcsrv/Makefile96
-rw-r--r--usr/src/uts/intel/rdcstub/Makefile93
-rw-r--r--usr/src/uts/intel/sdbc/Makefile172
-rw-r--r--usr/src/uts/intel/spuni/Makefile88
-rw-r--r--usr/src/uts/intel/sv/Makefile91
12 files changed, 1 insertions, 1217 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel
index d7616eac11..a648a12c41 100644
--- a/usr/src/uts/intel/Makefile.intel
+++ b/usr/src/uts/intel/Makefile.intel
@@ -285,7 +285,7 @@ DRV_KMODS += mm
DRV_KMODS += mouse8042
DRV_KMODS += mpt_sas
DRV_KMODS += mr_sas
-DRV_KMODS += mwl
+DRV_KMODS += mwl
DRV_KMODS += nca
DRV_KMODS += nsmb
DRV_KMODS += nulldriver
@@ -374,8 +374,6 @@ DRV_KMODS += fcoei
DRV_KMODS += qlt
DRV_KMODS += iscsit
DRV_KMODS += pppt
-DRV_KMODS += ncall nsctl sdbc nskern sv
-DRV_KMODS += ii rdc rdcsrv rdcstub
DRV_KMODS += iptun
DRV_KMODS += vmxnet3s
DRV_KMODS += pvscsi
@@ -633,7 +631,6 @@ MISC_KMODS += sata
MISC_KMODS += scsi
MISC_KMODS += sda
MISC_KMODS += sol_ofs
-MISC_KMODS += spuni
MISC_KMODS += strategy
MISC_KMODS += strplumb
MISC_KMODS += tem
diff --git a/usr/src/uts/intel/ii/Makefile b/usr/src/uts/intel/ii/Makefile
deleted file mode 100644
index 484f12bad1..0000000000
--- a/usr/src/uts/intel/ii/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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/intel/ii/Makefile
-#
-# This makefile drives the production of the ii kernel module
-#
-# intel 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 += $(CCVERBOSE)
-LDFLAGS += -dy -N"drv/nsctl" -N"drv/nskern" -N"misc/spuni"
-LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-
-CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
-
-.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/intel/ncall/Makefile b/usr/src/uts/intel/ncall/Makefile
deleted file mode 100644
index 40a25e1dd2..0000000000
--- a/usr/src/uts/intel/ncall/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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/intel/ncall/Makefile
-#
-# This makefile drives the production of the ncall kernel module
-#
-# intel 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)/intel/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/intel/nsctl/Makefile b/usr/src/uts/intel/nsctl/Makefile
deleted file mode 100644
index e57c1eb168..0000000000
--- a/usr/src/uts/intel/nsctl/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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/intel/nsctl/Makefile
-#
-# This makefile drives the production of the nsctl kernel module
-#
-# intel 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 += $(CCVERBOSE)
-LDFLAGS += -dy -N"drv/nskern" -N"drv/ncall" -N"misc/spuni"
-LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-
-CERRWARN += -_gcc=-Wno-parentheses
-
-.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/intel/nskern/Makefile b/usr/src/uts/intel/nskern/Makefile
deleted file mode 100644
index c57aaa4b54..0000000000
--- a/usr/src/uts/intel/nskern/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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/intel/nskern/Makefile
-#
-# This makefile drives the production of the nskern kernel module
-#
-# intel 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 -I./$(OBJS_DIR)
-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)
-AS_INC_PATH += -I$(DSF_DIR)/$(OBJS_DIR)
-
-ASSYM_H = $(DSF_DIR)/$(OBJS_DIR)/assym.h
-
-#
-# lint pass one enforcement
-#
-CFLAGS += -v
-
-.KEEP_STATE:
-
-$(OBJS_DIR)/nsc_asm.o: nsc_asm.s
-
-$(BINARY): $(ASSYM_H)
-
-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/intel/nskern/nsc_asm.s b/usr/src/uts/intel/nskern/nsc_asm.s
deleted file mode 100644
index 6f0c329511..0000000000
--- a/usr/src/uts/intel/nskern/nsc_asm.s
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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 "assym.h" /* Determine value of CPU_THREAD */
-#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
- * x86 variant
- */
-
-/*
- * 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)
-#if defined(__amd64)
- movl $0xff,%eax
- lock
- xchgb %al, (%rdi) /* rdi = lock addr */
- ret
-#elif defined(__i386)
- movl 4(%esp), %ecx /* ecx = lock addr */
- movl $0xff, %eax /* eax = 0xff */
- lock
- xchgb %al, (%ecx) /* atomic swap eax <-> *ecx */
- ret
-#else
-#error "port this routine"
-#endif
- SET_SIZE(nsc_ldstub)
-#endif
-
-/*
- * nsc_membar_stld(void)
- *
- * On SPARC this is a C callable interface to SPARC asm membar instruction.
- * For x86 we brute force it with a #LOCK instruction.
- */
-
-#if defined(lint) || defined(DS_DDICT)
-void
-nsc_membar_stld(void)
-{}
-#else
-
- ENTRY(nsc_membar_stld)
-#if defined(__amd64)
- mfence
- ret
-#elif defined(__i386)
- lock
- xorl $0, (%esp)
- ret
-#else
-#error "port this routine"
-#endif
- 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)
-#if defined(__amd64)
- movq 8(%rbp), %rax /* b()'s return pc, in a() */
- ret
-#elif defined(__i386)
- movl 4(%ebp), %eax /* b()'s return pc, in a() */
- ret
-#else
-#error "port this routine"
-#endif
- 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)
-#if defined(__amd64)
- movq (%rsp), %rax /* callee()'s return pc, in a() */
- ret
-#elif defined(__i386)
- movl (%esp), %eax /* callee()'s return pc, in a() */
- ret
-#else
-#error "port this routine"
-#endif
- 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)
-#if defined(__amd64)
- movq %gs:CPU_THREAD, %rax
- ret
-#elif defined(__i386)
- movl %gs:CPU_THREAD,%eax
- ret
-#else
-#error "port this routine"
-#endif
- SET_SIZE(nsc_threadp)
-
-#endif /* lint || DS_DDICT */
diff --git a/usr/src/uts/intel/rdc/Makefile b/usr/src/uts/intel/rdc/Makefile
deleted file mode 100644
index 337ef0f14c..0000000000
--- a/usr/src/uts/intel/rdc/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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/intel/rdc/Makefile
-#
-# This makefile drives the production of the rdc kernel module
-#
-# intel 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 += $(CCVERBOSE) -D_SD_8K_BLKSIZE -D_SYSCALL32
-LINT_DEFS += -D_SYSCALL32
-LINTTAGS += -erroff=E_FUNC_RET_MAYBE_IGNORED2
-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"
-
-CERRWARN += -_gcc=-Wno-switch
-CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
-
-
-.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/intel/rdcsrv/Makefile b/usr/src/uts/intel/rdcsrv/Makefile
deleted file mode 100644
index 852d4aa932..0000000000
--- a/usr/src/uts/intel/rdcsrv/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# uts/intel/rdcsrv/Makefile
-#
-# This makefile drives the production of the rdcsrv kernel module
-#
-# intel 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)
-ROOTLINK = $(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) $(ROOTLINK)
-
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE) -D_SD_8K_BLKSIZE -D_SYSCALL32
-LINT_DEFS += -D_SD_8K_BLKSIZE -D_SYSCALL32
-LDFLAGS += -dy -N"strmod/rpcmod" -N"misc/rdcstub"
-
-CERRWARN += -_gcc=-Wno-unused-label
-CERRWARN += -_gcc=-Wno-unused-variable
-
-.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)
-
-$(ROOTLINK): $(USR_MISC_DIR) $(ROOTMODULE)
- -$(RM) $@; $(LN) $(ROOTMODULE) $@
-
-#
-# Include common targets.
-#
-include ../Makefile.targ
diff --git a/usr/src/uts/intel/rdcstub/Makefile b/usr/src/uts/intel/rdcstub/Makefile
deleted file mode 100644
index 2a91cc1d7e..0000000000
--- a/usr/src/uts/intel/rdcstub/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# uts/intel/rdcstub/Makefile
-#
-# This makefile drives the production of the rdcsrv kernel module
-#
-# intel 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)
-ROOTLINK = $(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) $(ROOTLINK)
-
-#
-# 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)
-
-$(ROOTLINK): $(USR_MISC_DIR) $(ROOTMODULE)
- -$(RM) $@; $(LN) $(ROOTMODULE) $@
-
-#
-# Include common targets.
-#
-include ../Makefile.targ
diff --git a/usr/src/uts/intel/sdbc/Makefile b/usr/src/uts/intel/sdbc/Makefile
deleted file mode 100644
index bc506fab29..0000000000
--- a/usr/src/uts/intel/sdbc/Makefile
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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/intel/sdbc/Makefile
-#
-# This makefile drives the production of the sdbc kernel module
-#
-# intel 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 += $(CCVERBOSE) -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
-
-CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
-CERRWARN += -_gcc=-Wno-unused-label
-
-.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/intel/spuni/Makefile b/usr/src/uts/intel/spuni/Makefile
deleted file mode 100644
index f4c4d9378c..0000000000
--- a/usr/src/uts/intel/spuni/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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/intel/spuni/Makefile
-#
-# This makefile drives the production of the spuni kernel module
-#
-# intel 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/intel/sv/Makefile b/usr/src/uts/intel/sv/Makefile
deleted file mode 100644
index af3f10107e..0000000000
--- a/usr/src/uts/intel/sv/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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/intel/sv/Makefile
-#
-# This makefile drives the production of the sv kernel module
-#
-# intel 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 += $(CCVERBOSE)
-LDFLAGS += -dy -N"drv/nsctl" -N"drv/nskern" -N"misc/spuni"
-
-CERRWARN += -_gcc=-Wno-uninitialized
-
-.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