--- a/usr/src/cmd/fm/modules/Makefile	Tue May 27 19:35:38 2008 -0700
+++ b/usr/src/cmd/fm/modules/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -19,12 +19,26 @@
 # 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"
 
-sparc_SUBDIRS	= sun4u sun4v SUNW,SPARC-Enterprise
+sparc_SUBDIRS	= sun4u \
+		  sun4v \
+		  SUNW,SPARC-Enterprise \
+		  SUNW,Netra-CP3060 \
+		  SUNW,Netra-CP3260 \
+		  SUNW,Sun-Blade-T6300 \
+		  SUNW,Sun-Blade-T6320 \
+		  SUNW,Netra-T5220 \
+		  SUNW,Sun-Fire-T200 \
+		  SUNW,Netra-T5440 \
+		  SUNW,T5140 \
+		  SUNW,USBRDT-5240 \
+		  SUNW,SPARC-Enterprise-T5120  \
+		  SUNW,USBRDT-5440
+
 i386_SUBDIRS	=
 
 SUBDIRS = common $($(MACH)_SUBDIRS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3060/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3060/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,Netra-CP3060
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3060/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3260/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3260/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,Netra-CP3260
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-CP3260/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,57 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5220/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5220/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,Netra-T5220
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5220/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,57 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5440/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5440/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,Netra-T5440
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Netra-T5440/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,59 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe fault.io.vf.*
+subscribe fault.asic.ultraSPARC-T2plus.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise-T5120/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise-T5120/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,SPARC-Enterprise-T5120
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,SPARC-Enterprise-T5120/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,57 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6300/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6300/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,Sun-Blade-T6300
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6300/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6320/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6320/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,Sun-Blade-T6320
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Blade-T6320/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,57 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Fire-T200/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Fire-T200/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,Sun-Fire-T200
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,Sun-Fire-T200/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,T5140/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,T5140/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,T5140
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,T5140/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,59 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe fault.io.vf.*
+subscribe fault.asic.ultraSPARC-T2plus.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,USBRDT-5240/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,USBRDT-5240/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,USBRDT-5240
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,USBRDT-5240/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,58 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe fault.io.vf.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+SUBDIRS = etm
+
+include ../../Makefile.subdirs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/Makefile	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,29 @@
+#
+# 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"
+
+PLATFORMS = SUNW,USBRDT-5440
+
+include ../../sun4v/etm/Makefile.etm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/etm.conf	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,59 @@
+#
+# 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"
+
+# transport these FMA events from the domain to the SP
+subscribe fault.cpu.*
+subscribe fault.memory.*
+subscribe fault.io.fire.*
+subscribe fault.io.pci.*
+subscribe fault.io.pciex.*
+subscribe fault.io.n2.*
+subscribe fault.io.vf.*
+subscribe fault.asic.ultraSPARC-T2plus.*
+subscribe list.repaired
+
+#
+# etm agent properties:
+#
+# On supported systems, ETM can transport SP Alert event messages from the
+# SP to Solaris.  SP Alert messages are generated by the Service Processor
+# and indicate various conditions monitored by the SP.  The following
+# properties define how those messages are handled by Solaris.
+#
+# etm_alert_console - bool - log messages to system console (default=false)
+# etm_alert_syslogd - bool - log messages to messages file through
+#   syslogd (default=true)
+# etm_alert_facility - string - syslog(3C) log facility to use
+#   (default=LOG_DAEMON)
+#
+# The "etm_alert_facility" property may only be configured to use
+# LOG_DAEMON (which is the default) or one of LOG_LOCAL[0-7].  For
+# information about the use of local log facilities, refer to syslog(3C),
+# syslogd(1M), and syslog.conf(4).
+#
+# Example settings:
+# setprop etm_alert_console true
+# setprop etm_alert_facility LOG_LOCAL0
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/modules/sun4v/etm/Makefile.etm	Tue May 27 22:17:54 2008 -0700
@@ -0,0 +1,70 @@
+#
+# 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"
+
+.KEEP_STATE:
+.SUFFIXES:
+
+include ../../../../Makefile.cmd
+
+MODULE = etm
+CLASS = plat
+
+MODCLASS = plugins
+
+#
+#
+CONF = $(MODULE:%=%.conf)
+
+common_ROOTCONF = $(ROOT)/usr/lib/fm/fmd/plugins/$(CONF)
+arch_ROOTCONF = $(ROOT)/usr/platform/$(ARCH)/lib/fm/fmd/plugins/$(CONF)
+plat_ROOTCONF = $(PLATFORMS:%=$(ROOT)/usr/platform/%/lib/fm/fmd/plugins/$(CONF))
+ROOTCONF = $($(CLASS)_ROOTCONF)
+
+sun4v_ROOTPROG = ../../../../../sun4v/lib/fm/fmd/plugins/$(MODULE).so
+plat_ROOTPROG = $(ROOT)/usr/platform/$(PLATFORMS)/lib/fm/fmd/plugins/$(MODULE).so
+
+all:
+
+.NO_PARALLEL:
+.PARALLEL:
+
+clean:
+
+clobber: clean
+
+lint:
+
+install_h:
+
+$(ROOTCONF): $$(@D) $(CONF)
+	$(RM) $@ 
+	$(INS) -s -m 0644 -f $(@D) $(CONF)
+	$(RM) $(plat_ROOTPROG)
+	$(LN) -s $(sun4v_ROOTPROG) $(plat_ROOTPROG)
+
+install: $(ROOTCONF)
+
+include ../../Makefile.rootdirs

--- a/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Tue May 27 19:35:38 2008 -0700
+++ b/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Tue May 27 22:17:54 2008 -0700
@@ -179,6 +179,10 @@
 d none usr/platform/SUNW,Sun-Fire-T200 755 root sys
 d none usr/platform/SUNW,Sun-Fire-T200/lib 755 root bin
 d none usr/platform/SUNW,Sun-Fire-T200/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Sun-Fire-T200-hc-topology.xml 444 root bin
@@ -186,15 +190,30 @@
 f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/SPARC-Enterprise-T1000-hc-topology.xml 444 root bin
 f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Sun-Blade-T6300-hc-topology.xml 444 root bin
 f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Netra-T2000-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300 755 root sys
+d none usr/platform/SUNW,Sun-Blade-T6300/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,Sun-Blade-T6320 755 root sys
 d none usr/platform/SUNW,Sun-Blade-T6320/lib 755 root bin
 d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo/maps/Sun-Blade-T6320-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,SPARC-Enterprise-T5120 755 root sys
 d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib 755 root bin
 d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm 755 root bin
+d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps/SPARC-Enterprise-T5120-hc-topology.xml 444 root bin
@@ -202,6 +221,10 @@
 d none usr/platform/SUNW,T5140 755 root sys
 d none usr/platform/SUNW,T5140/lib 755 root bin
 d none usr/platform/SUNW,T5140/lib/fm 755 root bin
+d none usr/platform/SUNW,T5140/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,T5140/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,T5140/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,T5140/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,T5140/lib/fm/topo/maps/T5140-hc-topology.xml 444 root bin
@@ -211,36 +234,60 @@
 d none usr/platform/SUNW,Netra-CP3060 755 root sys
 d none usr/platform/SUNW,Netra-CP3060/lib 755 root bin
 d none usr/platform/SUNW,Netra-CP3060/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,Netra-CP3060/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,Netra-CP3060/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,Netra-CP3060/lib/fm/topo/maps/Netra-CP3060-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,Netra-CP3260 755 root sys
 d none usr/platform/SUNW,Netra-CP3260/lib 755 root bin
 d none usr/platform/SUNW,Netra-CP3260/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,Netra-CP3260/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps/Netra-CP3260-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,USBRDT-5240 755 root sys
 d none usr/platform/SUNW,USBRDT-5240/lib 755 root bin
 d none usr/platform/SUNW,USBRDT-5240/lib/fm 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,USBRDT-5240/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps/USBRDT-5240-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,Netra-T5220 755 root sys
 d none usr/platform/SUNW,Netra-T5220/lib 755 root bin
 d none usr/platform/SUNW,Netra-T5220/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-T5220/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,Netra-T5220/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps/Netra-T5220-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,Netra-T5440 755 root sys
 d none usr/platform/SUNW,Netra-T5440/lib 755 root bin
 d none usr/platform/SUNW,Netra-T5440/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-T5440/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,Netra-T5440/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps/Netra-T5440-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,USBRDT-5440 755 root sys
 d none usr/platform/SUNW,USBRDT-5440/lib 755 root bin
 d none usr/platform/SUNW,USBRDT-5440/lib/fm 755 root bin
+d none usr/platform/SUNW,USBRDT-5440/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,USBRDT-5440/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,USBRDT-5440/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,USBRDT-5440/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
 d none usr/platform/SUNW,USBRDT-5440/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,USBRDT-5440/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,USBRDT-5440/lib/fm/topo/maps/USBRDT-5440-hc-topology.xml 444 root bin