diff options
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel.shared | 6 | ||||
| -rw-r--r-- | usr/src/uts/intel/i2o_bs/Makefile | 101 | ||||
| -rw-r--r-- | usr/src/uts/intel/i2o_msg/Makefile | 97 | ||||
| -rw-r--r-- | usr/src/uts/intel/i2o_scsi/Makefile | 105 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/driver_aliases | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/driver_classes | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/minor_perm | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/name_to_major | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/pci_to_i2o/Makefile | 106 | ||||
| -rw-r--r-- | usr/src/uts/intel/ses/Makefile | 6 |
10 files changed, 3 insertions, 425 deletions
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index c93b5d3203..f3c5f47b7a 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -379,11 +379,6 @@ $(CLOSED_BUILD)CLOSED_DRV_KMODS += pcelx $(CLOSED_BUILD)CLOSED_DRV_KMODS += pcser # -# I2O specific module(s) -# -DRV_KMODS_32 += pci_to_i2o i2o_bs i2o_scsi - -# # SCSI Enclosure Services driver # DRV_KMODS += ses @@ -517,7 +512,6 @@ MISC_KMODS += gld MISC_KMODS += hidparser MISC_KMODS += hook MISC_KMODS += hpcsvc -MISC_KMODS_32 += i2o_msg MISC_KMODS += ibcm MISC_KMODS += ibdm MISC_KMODS += ibmf diff --git a/usr/src/uts/intel/i2o_bs/Makefile b/usr/src/uts/intel/i2o_bs/Makefile deleted file mode 100644 index 279336cf97..0000000000 --- a/usr/src/uts/intel/i2o_bs/Makefile +++ /dev/null @@ -1,101 +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 -# -# -# uts/intel/i2o_bs/Makefile -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the i2o_bs (I2O BS-OSM) -# driver kernel module. -# -# intel implementation architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = i2o_bs -OBJECTS = $(I2O_BS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(I2O_BS_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/i2o - -# -# Include common rules. -# -include $(UTSBASE)/intel/Makefile.intel - -# -# Define targets -# -ALL_TARGET = $(BINARY) $(SRC_CONFILE) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) - -# -# Overrides -# -DEF_BUILDS = $(DEF_BUILDS32) -ALL_BUILDS = $(ALL_BUILDS32) - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -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 $(UTSBASE)/intel/Makefile.targ diff --git a/usr/src/uts/intel/i2o_msg/Makefile b/usr/src/uts/intel/i2o_msg/Makefile deleted file mode 100644 index dcf2612a2d..0000000000 --- a/usr/src/uts/intel/i2o_msg/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 -# -# -# uts/intel/i2o_msg/Makefile -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This file makes the i2o_msg kernel misc module for an intel system -# -# intel architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. -# -# Define the module and object file sets. -# -MODULE = i2o_msg -OBJECTS = $(I2OMSG_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(I2OMSG_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) - -# -# Include common rules. -# -include $(UTSBASE)/intel/Makefile.intel - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides -# -DEF_BUILDS = $(DEF_BUILDS32) -ALL_BUILDS = $(ALL_BUILDS32) - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -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 $(UTSBASE)/intel/Makefile.targ diff --git a/usr/src/uts/intel/i2o_scsi/Makefile b/usr/src/uts/intel/i2o_scsi/Makefile deleted file mode 100644 index b0ec7f4113..0000000000 --- a/usr/src/uts/intel/i2o_scsi/Makefile +++ /dev/null @@ -1,105 +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 -# -# -# uts/intel/i2o_scsi/Makefile -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the i2o_scsi (SCSI HBA) -# driver kernel module. -# -# intel implementation architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = i2o_scsi -OBJECTS = $(I2O_SCSI_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(I2O_SCSI_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/i2o - -# -# Include common rules. -# -include $(UTSBASE)/intel/Makefile.intel - -# -# Define targets -# -ALL_TARGET = $(BINARY) $(SRC_CONFILE) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) - -# -# Overrides -# -DEF_BUILDS = $(DEF_BUILDS32) -ALL_BUILDS = $(ALL_BUILDS32) - -# -# Override defaults to build a unique, local modstubs.o. -# -MODSTUBS_DIR = $(OBJS_DIR) -CLEANFILES += $(MODSTUBS_O) - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN - -# -# Default build targets. -# -.KEEP_STATE: - -all: $(ALL_DEPS) - -def: $(DEF_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)/intel/Makefile.targ - diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases index 8092ae9065..cded87929e 100644 --- a/usr/src/uts/intel/os/driver_aliases +++ b/usr/src/uts/intel/os/driver_aliases @@ -6,7 +6,6 @@ pci_pci "pciclass,060401" pci_pci "pci1011,1" pci_pci "pci1011,21" pci_pci "pci1014,22" -pci_to_i2o "pciclass,0e0001" kb8042 "pnpPNP,303" mouse8042 "pnpPNP,f03" vgatext "pnpPNP,900" diff --git a/usr/src/uts/intel/os/driver_classes b/usr/src/uts/intel/os/driver_classes index 637129b3e5..90ad0e4f92 100644 --- a/usr/src/uts/intel/os/driver_classes +++ b/usr/src/uts/intel/os/driver_classes @@ -29,5 +29,3 @@ isa sysbus eisa sysbus pci pci pci_pci pci -pci_to_i2o i2o -i2o_scsi scsi diff --git a/usr/src/uts/intel/os/minor_perm b/usr/src/uts/intel/os/minor_perm index d1b263d3ae..56574d259b 100644 --- a/usr/src/uts/intel/os/minor_perm +++ b/usr/src/uts/intel/os/minor_perm @@ -89,7 +89,6 @@ vol:volctl 0666 root sys tnf:tnfctl 0600 root sys tnf:tnfmap 0600 root sys pm:* 0666 root sys -i2o_bs:* 0640 root sys wc:* 0600 root sys poll:* 0666 root sys cpc:shared 0666 root sys diff --git a/usr/src/uts/intel/os/name_to_major b/usr/src/uts/intel/os/name_to_major index ec127e3e43..0d8c92bff2 100644 --- a/usr/src/uts/intel/os/name_to_major +++ b/usr/src/uts/intel/os/name_to_major @@ -65,9 +65,6 @@ tnf 128 st 129 mscsi 130 pm 131 -pci_to_i2o 132 -i2o_scsi 133 -i2o_bs 134 poll 135 keysock 136 ipsecah 137 diff --git a/usr/src/uts/intel/pci_to_i2o/Makefile b/usr/src/uts/intel/pci_to_i2o/Makefile deleted file mode 100644 index 13d7c67aa2..0000000000 --- a/usr/src/uts/intel/pci_to_i2o/Makefile +++ /dev/null @@ -1,106 +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 -# -# -# uts/intel/pci_to_i2o/Makefile -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the pci_to_i2o nexus driver -# kernel module. -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = pci_to_i2o -OBJECTS = $(PCI_I2ONEXUS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PCI_I2ONEXUS_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/i2o - -# -# Include common rules. -# -include $(UTSBASE)/intel/Makefile.intel - -# -# Define targets -# -ALL_TARGET = $(BINARY) $(SRC_CONFILE) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) - -# -# Overrides -# -DEF_BUILDS = $(DEF_BUILDS32) -ALL_BUILDS = $(ALL_BUILDS32) - -# -# Override defaults to build a unique, local modstubs.o. -# -MODSTUBS_DIR = $(OBJS_DIR) -CLEANFILES += $(MODSTUBS_O) - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -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 $(UTSBASE)/intel/Makefile.targ - diff --git a/usr/src/uts/intel/ses/Makefile b/usr/src/uts/intel/ses/Makefile index 7bb902425e..13af293aa7 100644 --- a/usr/src/uts/intel/ses/Makefile +++ b/usr/src/uts/intel/ses/Makefile @@ -21,13 +21,13 @@ # # uts/intel/ses/Makefile # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" # -# This makefile drives the production of the i2o_bs (I2O BS-OSM) -# driver kernel module. +# This makefile drives the production of the ses (SCSI enclosure +# services) driver kernel module. # # intel implementation architecture dependent # |