From 7adfacf32dfbb1d0705cc8a39ffa7fc8a1aeff66 Mon Sep 17 00:00:00 2001 From: ml29623 Date: Thu, 17 Jan 2008 17:35:36 -0800 Subject: 6603582 nxge driver excludes i86xpv platform --HG-- rename : usr/src/pkgdefs/SUNWnxge.i/Makefile => usr/src/pkgdefs/SUNWnxge/Makefile rename : usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl => usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl rename : usr/src/pkgdefs/SUNWnxge.i/postinstall => usr/src/pkgdefs/SUNWnxge/postinstall rename : usr/src/pkgdefs/SUNWnxge.i/postremove => usr/src/pkgdefs/SUNWnxge/postremove rename : usr/src/pkgdefs/SUNWnxge.i/prototype_com => usr/src/pkgdefs/SUNWnxge/prototype_com rename : usr/src/pkgdefs/SUNWnxge.i/prototype_i386 => usr/src/pkgdefs/SUNWnxge/prototype_i386 rename : usr/src/uts/i86pc/nxge/Makefile => usr/src/uts/intel/nxge/Makefile --- usr/src/pkgdefs/Makefile | 2 +- usr/src/pkgdefs/SUNWnxge.i/Makefile | 40 ---------- usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl | 49 ------------ usr/src/pkgdefs/SUNWnxge.i/postinstall | 78 ------------------- usr/src/pkgdefs/SUNWnxge.i/postremove | 38 --------- usr/src/pkgdefs/SUNWnxge.i/prototype_com | 48 ------------ usr/src/pkgdefs/SUNWnxge.i/prototype_i386 | 59 -------------- usr/src/pkgdefs/SUNWnxge/Makefile | 40 ++++++++++ usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl | 49 ++++++++++++ usr/src/pkgdefs/SUNWnxge/postinstall | 81 +++++++++++++++++++ usr/src/pkgdefs/SUNWnxge/postremove | 38 +++++++++ usr/src/pkgdefs/SUNWnxge/preinstall | 32 ++++++++ usr/src/pkgdefs/SUNWnxge/prototype_com | 49 ++++++++++++ usr/src/pkgdefs/SUNWnxge/prototype_i386 | 56 ++++++++++++++ usr/src/tools/scripts/bfu.sh | 13 +++- usr/src/uts/i86pc/Makefile | 5 +- usr/src/uts/i86pc/Makefile.i86pc.shared | 3 +- usr/src/uts/i86pc/nxge/Makefile | 124 ------------------------------ usr/src/uts/intel/Makefile.intel.shared | 1 + usr/src/uts/intel/nxge/Makefile | 124 ++++++++++++++++++++++++++++++ 20 files changed, 486 insertions(+), 443 deletions(-) delete mode 100755 usr/src/pkgdefs/SUNWnxge.i/Makefile delete mode 100755 usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl delete mode 100755 usr/src/pkgdefs/SUNWnxge.i/postinstall delete mode 100755 usr/src/pkgdefs/SUNWnxge.i/postremove delete mode 100755 usr/src/pkgdefs/SUNWnxge.i/prototype_com delete mode 100755 usr/src/pkgdefs/SUNWnxge.i/prototype_i386 create mode 100755 usr/src/pkgdefs/SUNWnxge/Makefile create mode 100755 usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl create mode 100755 usr/src/pkgdefs/SUNWnxge/postinstall create mode 100755 usr/src/pkgdefs/SUNWnxge/postremove create mode 100644 usr/src/pkgdefs/SUNWnxge/preinstall create mode 100755 usr/src/pkgdefs/SUNWnxge/prototype_com create mode 100755 usr/src/pkgdefs/SUNWnxge/prototype_i386 delete mode 100644 usr/src/uts/i86pc/nxge/Makefile create mode 100644 usr/src/uts/intel/nxge/Makefile (limited to 'usr/src') diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile index 78193c0db0..1cd100b1f8 100644 --- a/usr/src/pkgdefs/Makefile +++ b/usr/src/pkgdefs/Makefile @@ -130,7 +130,7 @@ i386_SUBDIRS= \ SUNWmv88sx \ SUNWnge \ SUNWnvsata \ - SUNWnxge.i \ + SUNWnxge \ SUNWonmtst.i \ SUNWos86r \ SUNWpsdcr \ diff --git a/usr/src/pkgdefs/SUNWnxge.i/Makefile b/usr/src/pkgdefs/SUNWnxge.i/Makefile deleted file mode 100755 index 896956325b..0000000000 --- a/usr/src/pkgdefs/SUNWnxge.i/Makefile +++ /dev/null @@ -1,40 +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 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -DATAFILES += depend i.renameold - - - -.KEEP_STATE: - -all: $(FILES) postinstall postremove - -install: all pkg - -include ../Makefile.targ diff --git a/usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl b/usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl deleted file mode 100755 index fbdde5c66b..0000000000 --- a/usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file describes characteristics of the -# package, such as package abbreviation, full package name, package version, -# and package architecture. -# -PKG="SUNWnxge" -NAME="Sun NIU leaf driver" -ARCH="i386.i86pc" -VERSION="ONVERS,REV=0.0.0" -SUNW_PRODNAME="SunOS" -SUNW_PRODVERS="RELEASE/VERSION" -SUNW_PKGTYPE="root" -SUNW_PKG_ALLZONES="true" -SUNW_PKG_HOLLOW="true" -SUNW_PKG_THISZONE="false" -MAXINST="1000" -CATEGORY="system" -DESC="Sun NIU 10Gb/1Gb leaf driver" -VENDOR="Sun Microsystems, Inc." -HOTLINE="Please contact your local service provider" -EMAIL="" -CLASSES="none renameold" -BASEDIR=/ -SUNW_PKGVERS="1.0" - diff --git a/usr/src/pkgdefs/SUNWnxge.i/postinstall b/usr/src/pkgdefs/SUNWnxge.i/postinstall deleted file mode 100755 index a24aaa393e..0000000000 --- a/usr/src/pkgdefs/SUNWnxge.i/postinstall +++ /dev/null @@ -1,78 +0,0 @@ -#!/sbin/sh -# -# 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 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -set -u - -PATH="/usr/bin:/usr/sbin:${PATH}" -export PATH - -# -# Driver info -# -DRV=nxge -DRVALIAS=" \"pciex108e,abcd\" \"SUNW,niusl\"" - -DRVPERM='* 0600 root sys' -# POLICY='read_priv_set=net_rawaccess write_priv_set=net_rawaccess' -MAJORDEV=11 - -# -# Select the correct add_drv options to execute. -# -if [ "${BASEDIR}" = "/" ]; then - # - # Irrespective of whether hardware exists - # or not don't attempt to attach driver - # to the hardware. This is to avoid problems - # with installing a 32 bit driver on a 64 bit - # running system. - # - ADD_DRV="add_drv -n" -else - # - # On a client, - # modify the system files and touch/reconfigure - # for reconfigure reboot - # - ADD_DRV="add_drv -b ${BASEDIR}" -fi - -# -# Make sure add_drv has *not* been previously executed -# before attempting to add the driver. -# -grep -w "${DRV}" ${BASEDIR}/etc/name_to_major > /dev/null 2>&1 -if [ $? -eq 1 ]; then - ${ADD_DRV} -m "${DRVPERM}" -i "${DRVALIAS}" ${DRV} - if [ $? -ne 0 ]; then - echo "\nFailed add_drv!\n" >&2 - exit 1 - fi -fi - -exit 0 diff --git a/usr/src/pkgdefs/SUNWnxge.i/postremove b/usr/src/pkgdefs/SUNWnxge.i/postremove deleted file mode 100755 index 9839cb4cd6..0000000000 --- a/usr/src/pkgdefs/SUNWnxge.i/postremove +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/sh -# -# 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 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -BD=${BASEDIR:-/} -if grep -w nxge $BD/etc/name_to_major > /dev/null 2>&1 -then - rem_drv -b ${BD} nxge - if [ $? -ne 0 ] - then - exit 1 - fi -fi -exit 0 diff --git a/usr/src/pkgdefs/SUNWnxge.i/prototype_com b/usr/src/pkgdefs/SUNWnxge.i/prototype_com deleted file mode 100755 index f4ed0e1c5e..0000000000 --- a/usr/src/pkgdefs/SUNWnxge.i/prototype_com +++ /dev/null @@ -1,48 +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 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search # where to find pkg objects -#!include # include another 'prototype' file -#!default # default used if not specified on entry -#!= # puts parameter in pkg environment - -# packaging files -i pkginfo -i copyright -i depend -i postinstall -i postremove -i i.renameold -# -# source locations relative to the prototype file -# -# SUNWnxge.i -# diff --git a/usr/src/pkgdefs/SUNWnxge.i/prototype_i386 b/usr/src/pkgdefs/SUNWnxge.i/prototype_i386 deleted file mode 100755 index 4dd6b94f28..0000000000 --- a/usr/src/pkgdefs/SUNWnxge.i/prototype_i386 +++ /dev/null @@ -1,59 +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 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search # where to find pkg objects -#!include # include another 'prototype' file -#!default # default used if not specified on entry -#!= # puts parameter in pkg environment - -# packaging files -# -# Include ISA independent files (prototype_com) -# -!include prototype_com -# -# -# -# List files which are SPARC specific here -# -# source locations relative to the prototype file -# -# -# SUNWnxge.i -# -d none platform 755 root sys -d none platform/i86pc 755 root sys -d none platform/i86pc/kernel 755 root sys -d none platform/i86pc/kernel/drv 755 root sys -f none platform/i86pc/kernel/drv/nxge 755 root sys -e renameold platform/i86pc/kernel/drv/nxge.conf 0644 root sys -d none platform/i86pc/kernel/drv/amd64 755 root sys -f none platform/i86pc/kernel/drv/amd64/nxge 755 root sys diff --git a/usr/src/pkgdefs/SUNWnxge/Makefile b/usr/src/pkgdefs/SUNWnxge/Makefile new file mode 100755 index 0000000000..896956325b --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/Makefile @@ -0,0 +1,40 @@ +# +# 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 2007 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +include ../Makefile.com + +DATAFILES += depend i.renameold + + + +.KEEP_STATE: + +all: $(FILES) postinstall postremove + +install: all pkg + +include ../Makefile.targ diff --git a/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl b/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl new file mode 100755 index 0000000000..c0be96a129 --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl @@ -0,0 +1,49 @@ +# +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# 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 +# +# ident "%Z%%M% %I% %E% SMI" +# +# This required package information file describes characteristics of the +# package, such as package abbreviation, full package name, package version, +# and package architecture. +# +PKG="SUNWnxge" +NAME="Sun NIU leaf driver" +ARCH="ISA" +VERSION="ONVERS,REV=0.0.0" +SUNW_PRODNAME="SunOS" +SUNW_PRODVERS="RELEASE/VERSION" +SUNW_PKGTYPE="root" +SUNW_PKG_ALLZONES="true" +SUNW_PKG_HOLLOW="true" +SUNW_PKG_THISZONE="false" +MAXINST="1000" +CATEGORY="system" +DESC="Sun NIU 10Gb/1Gb leaf driver" +VENDOR="Sun Microsystems, Inc." +HOTLINE="Please contact your local service provider" +EMAIL="" +CLASSES="none renameold" +BASEDIR=/ +SUNW_PKGVERS="1.0" + diff --git a/usr/src/pkgdefs/SUNWnxge/postinstall b/usr/src/pkgdefs/SUNWnxge/postinstall new file mode 100755 index 0000000000..d7abc0c43b --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/postinstall @@ -0,0 +1,81 @@ +#!/sbin/sh +# +# 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 "%Z%%M% %I% %E% SMI" +# + +set -u + +PATH="/usr/bin:/usr/sbin:${PATH}" +export PATH + +# +# Driver info +# +DRV=nxge +DRVALIAS=" \"pciex108e,abcd\" \"SUNW,niusl\"" + +DRVPERM='* 0600 root sys' +# POLICY='read_priv_set=net_rawaccess write_priv_set=net_rawaccess' +MAJORDEV=11 + +# +# Select the correct add_drv options to execute. +# +if [ "${BASEDIR}" = "/" ]; then + # + # Irrespective of whether hardware exists + # or not don't attempt to attach driver + # to the hardware. This is to avoid problems + # with installing a 32 bit driver on a 64 bit + # running system. + # + ADD_DRV="add_drv -n" +else + # + # On a client, + # modify the system files and touch/reconfigure + # for reconfigure reboot + # + ADD_DRV="add_drv -b ${BASEDIR}" +fi + +removef $PKGINST /platform/i86pc/kernel/drv/nxge.conf >/dev/null 2>&1 +removef -f $PKGINST >/dev/null 2>&1 + +# +# Make sure add_drv has *not* been previously executed +# before attempting to add the driver. +# +grep -w "${DRV}" ${BASEDIR}/etc/name_to_major > /dev/null 2>&1 +if [ $? -eq 1 ]; then + ${ADD_DRV} -m "${DRVPERM}" -i "${DRVALIAS}" ${DRV} + if [ $? -ne 0 ]; then + echo "\nFailed add_drv!\n" >&2 + exit 1 + fi +fi + +exit 0 diff --git a/usr/src/pkgdefs/SUNWnxge/postremove b/usr/src/pkgdefs/SUNWnxge/postremove new file mode 100755 index 0000000000..9839cb4cd6 --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/postremove @@ -0,0 +1,38 @@ +#!/sbin/sh +# +# 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 2007 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +BD=${BASEDIR:-/} +if grep -w nxge $BD/etc/name_to_major > /dev/null 2>&1 +then + rem_drv -b ${BD} nxge + if [ $? -ne 0 ] + then + exit 1 + fi +fi +exit 0 diff --git a/usr/src/pkgdefs/SUNWnxge/preinstall b/usr/src/pkgdefs/SUNWnxge/preinstall new file mode 100644 index 0000000000..b6ffe7409f --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/preinstall @@ -0,0 +1,32 @@ +#!/sbin/sh +# +# 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 "%Z%%M% %I% %E% SMI" +# +if [ -f ${BASEDIR}/platform/i86pc/kernel/drv/nxge.conf ]; then + mv ${BASEDIR}/platform/i86pc/kernel/drv/nxge.conf ${BASEDIR}/kernel/drv/nxge.conf +fi + +exit 0 diff --git a/usr/src/pkgdefs/SUNWnxge/prototype_com b/usr/src/pkgdefs/SUNWnxge/prototype_com new file mode 100755 index 0000000000..960b0dcdfd --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/prototype_com @@ -0,0 +1,49 @@ +# +# 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 "%Z%%M% %I% %E% SMI" +# +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search # where to find pkg objects +#!include # include another 'prototype' file +#!default # default used if not specified on entry +#!= # puts parameter in pkg environment + +# packaging files +i pkginfo +i copyright +i depend +i preinstall +i postinstall +i postremove +i i.renameold +# +# source locations relative to the prototype file +# +# SUNWnxge.i +# diff --git a/usr/src/pkgdefs/SUNWnxge/prototype_i386 b/usr/src/pkgdefs/SUNWnxge/prototype_i386 new file mode 100755 index 0000000000..df6bc64cc6 --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/prototype_i386 @@ -0,0 +1,56 @@ +# +# 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 "%Z%%M% %I% %E% SMI" +# +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search # where to find pkg objects +#!include # include another 'prototype' file +#!default # default used if not specified on entry +#!= # puts parameter in pkg environment + +# packaging files +# +# Include ISA independent files (prototype_com) +# +!include prototype_com +# +# +# +# +# source locations relative to the prototype file +# +# +# SUNWnxge.i +# +d none kernel 0755 root sys +d none kernel/drv 0755 root sys +f none kernel/drv/nxge 0755 root sys +e renameold kernel/drv/nxge.conf 0644 root sys +d none kernel/drv/amd64 0755 root sys +f none kernel/drv/amd64/nxge 0755 root sys diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh index c86cb80626..8a70cece12 100644 --- a/usr/src/tools/scripts/bfu.sh +++ b/usr/src/tools/scripts/bfu.sh @@ -21,7 +21,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -6956,6 +6956,17 @@ mondo_loop() { rm -f $root/kernel/misc/amd64/acpi_intp fi + # + # Remove nxge module (moved to a generic location to support xVM) + # + if [ $target_isa = i386 ]; then + rm -f $root/platform/i86pc/kernel/drv/nxge + rm -f $root/platform/i86pc/kernel/drv/amd64/nxge + # We're doing a backward bfu. + rm -f $root/kernel/drv/nxge + rm -f $root/kernel/drv/amd64/nxge + fi + # # Remove obsolete librac # diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile index 9659a4c57f..3b6e7b11a6 100644 --- a/usr/src/uts/i86pc/Makefile +++ b/usr/src/uts/i86pc/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -42,10 +42,9 @@ INTEL_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR) INTEL_LINTS = genunix -LINT_PARALLEL_KMODS = $(PARALLEL_KMODS:nxge=) LINT_LIBS = $(LINT_LIB) \ $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ - $(LINT_PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ + $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln) diff --git a/usr/src/uts/i86pc/Makefile.i86pc.shared b/usr/src/uts/i86pc/Makefile.i86pc.shared index 5c41559753..91411508f1 100644 --- a/usr/src/uts/i86pc/Makefile.i86pc.shared +++ b/usr/src/uts/i86pc/Makefile.i86pc.shared @@ -22,7 +22,7 @@ # # uts/i86pc/Makefile.i86pc # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -241,7 +241,6 @@ DRV_KMODS += pcplusmp DRV_KMODS += cpc DRV_KMODS += pci DRV_KMODS += npe -DRV_KMODS += nxge DRV_KMODS += pci-ide DRV_KMODS += xsvc DRV_KMODS += mc-amd diff --git a/usr/src/uts/i86pc/nxge/Makefile b/usr/src/uts/i86pc/nxge/Makefile deleted file mode 100644 index a001b6c7f7..0000000000 --- a/usr/src/uts/i86pc/nxge/Makefile +++ /dev/null @@ -1,124 +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/i86pc/nxge/Makefile -# -# 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 Sun NIU -# 10G/1G Ethernet leaf 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 = nxge -NXGE_OBJECTS = $(NXGE_OBJS) $(NXGE_NPI_OBJS) -OBJECTS = $(NXGE_OBJECTS:%=$(OBJS_DIR)/%) -LINTS = $(NXGE_OBJECTS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/nxge - -# -# Include common rules. -# -include $(UTSBASE)/i86pc/Makefile.i86pc - -# -# Override defaults to build a unique, local modstubs.o. -# -MODSTUBS_DIR = $(OBJS_DIR) - -CLEANFILES += $(MODSTUBS_O) - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) - -# -# -# Turn on doubleword alignment for 64 bit registers -# -CFLAGS += -dalign -# -# Include nxge specific header files -# -INC_PATH += -I$(UTSBASE)/common -INC_PATH += -I$(UTSBASE)/common/io/nxge/npi -INC_PATH += -I$(UTSBASE)/common/sys/nxge -# -# -# lint pass one enforcement -# -CFLAGS += -DSOLARIS -# -#ALL_BUILDS = $(ALL_BUILDS64) -#DEF_BUILDS = $(DEF_BUILDS64) -#CLEANLINTFILES += $(LINT64_FILES) -# -LINTFLAGS += -DSOLARIS -# -# STREAMS, DDI API limitations and other ON header file definitions such as ethernet.h -# force us to turn off these lint checks. -# -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_FALSE_LOGICAL_EXPR -# -# Driver depends on mac & IP -# -LDFLAGS += -dy -N misc/mac -N drv/ip - -# -# 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)/i86pc/Makefile.targ diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index d132a3ac5a..d82da0c29e 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -263,6 +263,7 @@ DRV_KMODS_32 += mscsi DRV_KMODS_32 += msm DRV_KMODS += nca DRV_KMODS += nv_sata +DRV_KMODS += nxge DRV_KMODS += openeepr DRV_KMODS += pci_pci DRV_KMODS += pcic diff --git a/usr/src/uts/intel/nxge/Makefile b/usr/src/uts/intel/nxge/Makefile new file mode 100644 index 0000000000..fa480ba5e9 --- /dev/null +++ b/usr/src/uts/intel/nxge/Makefile @@ -0,0 +1,124 @@ +# +# 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/nxge/Makefile +# +# Copyright 2008 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 Sun NIU +# 10G/1G Ethernet leaf 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 = nxge +NXGE_OBJECTS = $(NXGE_OBJS) $(NXGE_NPI_OBJS) +OBJECTS = $(NXGE_OBJECTS:%=$(OBJS_DIR)/%) +LINTS = $(NXGE_OBJECTS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) +CONF_SRCDIR = $(UTSBASE)/common/io/nxge + +# +# Include common rules. +# +include $(UTSBASE)/intel/Makefile.intel + +# +# Override defaults to build a unique, local modstubs.o. +# +MODSTUBS_DIR = $(OBJS_DIR) + +CLEANFILES += $(MODSTUBS_O) + +# +# Define targets +# +ALL_TARGET = $(BINARY) +LINT_TARGET = $(MODULE).lint +INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) + +# +# +# Turn on doubleword alignment for 64 bit registers +# +CFLAGS += -dalign +# +# Include nxge specific header files +# +INC_PATH += -I$(UTSBASE)/common +INC_PATH += -I$(UTSBASE)/common/io/nxge/npi +INC_PATH += -I$(UTSBASE)/common/sys/nxge +# +# +# lint pass one enforcement +# +CFLAGS += -DSOLARIS +# +#ALL_BUILDS = $(ALL_BUILDS64) +#DEF_BUILDS = $(DEF_BUILDS64) +#CLEANLINTFILES += $(LINT64_FILES) +# +LINTFLAGS += -DSOLARIS +# +# STREAMS, DDI API limitations and other ON header file definitions such as ethernet.h +# force us to turn off these lint checks. +# +LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN +LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW +LINTTAGS += -erroff=E_FALSE_LOGICAL_EXPR +# +# Driver depends on mac & IP +# +LDFLAGS += -dy -N misc/mac -N drv/ip + +# +# 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 -- cgit v1.2.3