summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorVivek Gavaskar <vivek.n.gavaskar@sun.com>2008-09-10 18:04:24 -0700
committerVivek Gavaskar <vivek.n.gavaskar@sun.com>2008-09-10 18:04:24 -0700
commit355518542cbbe7ea7378c1ec2cc282d465467484 (patch)
tree223625745faf4d2d1fcdbf11b0f8cd2a624cfb4c /usr/src
parentfa116a1b3360aaf2b39fa16ebcd653986d21f18a (diff)
downloadillumos-joyent-355518542cbbe7ea7378c1ec2cc282d465467484.tar.gz
6738867 Remove Solaris support for platform USBRDT-5440
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/fm/modules/Makefile4
-rw-r--r--usr/src/cmd/fm/modules/SUNW,USBRDT-5440/Makefile29
-rw-r--r--usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/Makefile29
-rw-r--r--usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/etm.conf59
-rw-r--r--usr/src/lib/fm/topo/maps/Makefile4
-rw-r--r--usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/Makefile33
-rw-r--r--usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/USBRDT-5440-hc-topology.xml56
-rw-r--r--usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c15
-rw-r--r--usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h18
-rw-r--r--usr/src/lib/libpcp/sparc/Makefile5
-rw-r--r--usr/src/pkgdefs/SUNWcart200.v/prototype_com3
-rw-r--r--usr/src/pkgdefs/SUNWfmd/prototype_sparc10
-rw-r--r--usr/src/pkgdefs/SUNWkvmt200.v/prototype_com8
-rw-r--r--usr/src/pkgdefs/etc/exception_list_sparc1
-rw-r--r--usr/src/psm/stand/boot/sparcv9/sun4v/Makefile3
-rw-r--r--usr/src/uts/sun4v/Makefile16
-rw-r--r--usr/src/uts/sun4v/Makefile.lightning38
-rw-r--r--usr/src/uts/sun4v/Makefile.sun4v.shared3
18 files changed, 6 insertions, 328 deletions
diff --git a/usr/src/cmd/fm/modules/Makefile b/usr/src/cmd/fm/modules/Makefile
index 30747fe5f3..dbdcfd3d13 100644
--- a/usr/src/cmd/fm/modules/Makefile
+++ b/usr/src/cmd/fm/modules/Makefile
@@ -22,7 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
sparc_SUBDIRS = sun4u \
sun4v \
@@ -36,8 +35,7 @@ sparc_SUBDIRS = sun4u \
SUNW,Netra-T5440 \
SUNW,T5140 \
SUNW,USBRDT-5240 \
- SUNW,SPARC-Enterprise-T5120 \
- SUNW,USBRDT-5440
+ SUNW,SPARC-Enterprise-T5120
i386_SUBDIRS =
diff --git a/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/Makefile b/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/Makefile
deleted file mode 100644
index e308b53487..0000000000
--- a/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-
-SUBDIRS = etm
-
-include ../../Makefile.subdirs
diff --git a/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/Makefile b/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/Makefile
deleted file mode 100644
index eb97ed15ce..0000000000
--- a/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-PLATFORMS = SUNW,USBRDT-5440
-
-include ../../sun4v/etm/Makefile.etm
diff --git a/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/etm.conf b/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/etm.conf
deleted file mode 100644
index 77c9f66f00..0000000000
--- a/usr/src/cmd/fm/modules/SUNW,USBRDT-5440/etm/etm.conf
+++ /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 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
-#
diff --git a/usr/src/lib/fm/topo/maps/Makefile b/usr/src/lib/fm/topo/maps/Makefile
index 3c53c51980..836fe50f76 100644
--- a/usr/src/lib/fm/topo/maps/Makefile
+++ b/usr/src/lib/fm/topo/maps/Makefile
@@ -23,7 +23,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
sparc_SUBDIRS = sun4u \
sun4v \
@@ -39,8 +38,7 @@ sparc_SUBDIRS = sun4u \
SUNW,Netra-CP3260 \
SUNW,USBRDT-5240 \
SUNW,Netra-T5220 \
- SUNW,Netra-T5440 \
- SUNW,USBRDT-5440
+ SUNW,Netra-T5440
i386_SUBDIRS = i86pc \
i386 \
diff --git a/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/Makefile b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/Makefile
deleted file mode 100644
index 097c6f2c8d..0000000000
--- a/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-PLATFORMS = SUNW,USBRDT-5440
-CLASS = platform
-DTDFILE = topology.dtd.1
-TOPOFILE = USBRDT-5440-hc-topology.xml
-SRCDIR = ../SUNW,USBRDT-5440
-
-include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/USBRDT-5440-hc-topology.xml b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/USBRDT-5440-hc-topology.xml
deleted file mode 100644
index f32127f62e..0000000000
--- a/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/USBRDT-5440-hc-topology.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
-<!--
- 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"
--->
-
-<topology name='SUNW,USBRDT-5440' scheme='hc'>
- <range name='motherboard' min='0' max='0'>
- <enum-method name='motherboard' version='1'/>
-
- <dependents grouping='children'>
- <range name='interconnect' min='0' max='3'>
- <enum-method name='zambezi' version='1'/>
- </range>
- </dependents>
-
- <dependents grouping='children'>
- <range name='chip' min='0' max='3'>
- <enum-method name='chip' version='1'/>
- </range>
- </dependents>
-
- <dependents grouping='children'>
- <range name='hostbridge' min='0' max='254'>
- <enum-method name='hostbridge' version='1'/>
- </range>
- </dependents>
-
- </range>
- <range name='ses-enclosure' min='0' max='1024'>
- <enum-method name='ses' version='1' />
- </range>
-</topology>
-
diff --git a/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c b/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c
index 3103ac37ff..94721343ac 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c
@@ -24,8 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <strings.h>
#include "hb_rcid.h"
@@ -44,14 +42,6 @@ prc_t t5140_prcs[] = {
{ 1, 0x500 }
};
-/* A list of physical root complexes of the SUNW,USBRDT-5440 platform */
-prc_t usbrdt_5440_prcs[] = {
- /* physical id, bus address */
- { 0, 0x400 },
- { 1, 0x500 },
- { 2, 0x600 },
- { 3, 0x700 }
-};
pprc_t plat_prcids[] = {
/*
@@ -96,10 +86,7 @@ pprc_t plat_prcids[] = {
t5140_prcs },
{ "SUNW,USBRDT-5240",
sizeof (t5140_prcs) / sizeof (prc_t),
- t5140_prcs },
- { "SUNW,USBRDT-5440",
- sizeof (usbrdt_5440_prcs) / sizeof (prc_t),
- usbrdt_5440_prcs }
+ t5140_prcs }
};
pprcs_t prcids = {
diff --git a/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h
index 504e1ac705..bd7282319a 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h
+++ b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h
@@ -27,8 +27,6 @@
#ifndef _PCI_SUN4V_H
#define _PCI_SUN4V_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include "pcibus_labels.h"
#ifdef __cplusplus
@@ -109,17 +107,6 @@ physnm_t blade_t6340_pnms[] = {
{ 1, "SYS/EM1" }
};
-physnm_t usbrdt5440_pnms[] = {
- /* Slot #, Label */
- { 0, "MB/RISER0/EM0" },
- { 1, "MB/RISER0/EM1" },
- { 2, "MB/RISER0/EM2" },
- { 3, "MB/RISER0/EM3" },
- { 4, "MB/RISER1/EM4" },
- { 5, "MB/RISER1/EM5" },
- { 6, "MB/RISER1/EM6" }
-};
-
pphysnm_t plat_pnames[] = {
{ "Sun-Fire-T200",
sizeof (t200_pnms) / sizeof (physnm_t),
@@ -154,10 +141,7 @@ pphysnm_t plat_pnames[] = {
netra_t5440_pnms },
{ "Sun-Blade-T6340",
sizeof (blade_t6340_pnms) / sizeof (physnm_t),
- blade_t6340_pnms },
- { "USBRDT-5440",
- sizeof (usbrdt5440_pnms) / sizeof (physnm_t),
- usbrdt5440_pnms },
+ blade_t6340_pnms }
};
physlot_names_t PhyslotNMs = {
diff --git a/usr/src/lib/libpcp/sparc/Makefile b/usr/src/lib/libpcp/sparc/Makefile
index 3c354e78d2..5c2809b7df 100644
--- a/usr/src/lib/libpcp/sparc/Makefile
+++ b/usr/src/lib/libpcp/sparc/Makefile
@@ -22,8 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# lib/libpcp/sparc/Makefile
UTSBASE= ../../../uts
@@ -45,8 +43,7 @@ LINKED_PLATFORMS = SUNW,Sun-Fire-T200 \
SUNW,Netra-CP3260 \
SUNW,USBRDT-5240 \
SUNW,Netra-T5220 \
- SUNW,Netra-T5440 \
- SUNW,USBRDT-5440
+ SUNW,Netra-T5440
include ../Makefile.com
diff --git a/usr/src/pkgdefs/SUNWcart200.v/prototype_com b/usr/src/pkgdefs/SUNWcart200.v/prototype_com
index f10b57f21a..a174029570 100644
--- a/usr/src/pkgdefs/SUNWcart200.v/prototype_com
+++ b/usr/src/pkgdefs/SUNWcart200.v/prototype_com
@@ -22,8 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This 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.
@@ -72,4 +70,3 @@ s none platform/SUNW,Sun-Blade-T6320=sun4v
s none platform/SUNW,Netra-CP3260=sun4v
s none platform/SUNW,USBRDT-5240=sun4v
s none platform/SUNW,Sun-Blade-T6340=sun4v
-s none platform/SUNW,USBRDT-5440=sun4v
diff --git a/usr/src/pkgdefs/SUNWfmd/prototype_sparc b/usr/src/pkgdefs/SUNWfmd/prototype_sparc
index 7fb9a129dd..d892b94f6b 100644
--- a/usr/src/pkgdefs/SUNWfmd/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWfmd/prototype_sparc
@@ -287,13 +287,3 @@ s none usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.so=../../../../../su
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
diff --git a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com
index 0ad4a6f229..414dac87a6 100644
--- a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com
@@ -22,8 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This 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.
@@ -56,7 +54,6 @@ d none usr/platform/SUNW,T5140 755 root sys
d none usr/platform/SUNW,USBRDT-5240 755 root sys
d none usr/platform/SUNW,Netra-T5220 755 root sys
d none usr/platform/SUNW,Netra-T5440 755 root sys
-d none usr/platform/SUNW,USBRDT-5440 755 root sys
#
# create links to sun4v platform
#
@@ -68,7 +65,6 @@ s none usr/platform/SUNW,T5140/sbin=../sun4v/sbin
s none usr/platform/SUNW,USBRDT-5240/sbin=../sun4v/sbin
s none usr/platform/SUNW,Netra-T5220/sbin=../sun4v/sbin
s none usr/platform/SUNW,Netra-T5440/sbin=../sun4v/sbin
-s none usr/platform/SUNW,USBRDT-5440/sbin=../sun4v/sbin
#
# create lib directory
#
@@ -82,7 +78,6 @@ d none usr/platform/SUNW,T5140/lib 755 root bin
d none usr/platform/SUNW,USBRDT-5240/lib 755 root bin
d none usr/platform/SUNW,Netra-T5220/lib 755 root bin
d none usr/platform/SUNW,Netra-T5440/lib 755 root bin
-d none usr/platform/SUNW,USBRDT-5440/lib 755 root bin
#
# add binary and libraries for prtdiag
#
@@ -103,7 +98,6 @@ s none usr/platform/SUNW,T5140/lib/libpcp.so=../../sun4v/lib/libpcp.so
s none usr/platform/SUNW,USBRDT-5240/lib/libpcp.so=../../sun4v/lib/libpcp.so
s none usr/platform/SUNW,Netra-T5220/lib/libpcp.so=../../sun4v/lib/libpcp.so
s none usr/platform/SUNW,Netra-T5440/lib/libpcp.so=../../sun4v/lib/libpcp.so
-s none usr/platform/SUNW,USBRDT-5440/lib/libpcp.so=../../sun4v/lib/libpcp.so
s none usr/platform/SUNW,Sun-Fire-T200/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
s none usr/platform/SUNW,Netra-CP3060/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
@@ -115,7 +109,6 @@ s none usr/platform/SUNW,T5140/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
s none usr/platform/SUNW,USBRDT-5240/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
s none usr/platform/SUNW,Netra-T5220/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
s none usr/platform/SUNW,Netra-T5440/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
-s none usr/platform/SUNW,USBRDT-5440/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
#
# platform-dependent boot object
@@ -130,7 +123,6 @@ s none usr/platform/SUNW,T5140/lib/fs=../../sun4v/lib/fs
s none usr/platform/SUNW,USBRDT-5240/lib/fs=../../sun4v/lib/fs
s none usr/platform/SUNW,Netra-T5220/lib/fs=../../sun4v/lib/fs
s none usr/platform/SUNW,Netra-T5440/lib/fs=../../sun4v/lib/fs
-s none usr/platform/SUNW,USBRDT-5440/lib/fs=../../sun4v/lib/fs
#
# add erie link
#
diff --git a/usr/src/pkgdefs/etc/exception_list_sparc b/usr/src/pkgdefs/etc/exception_list_sparc
index 55a8cfa2ac..bfbd483227 100644
--- a/usr/src/pkgdefs/etc/exception_list_sparc
+++ b/usr/src/pkgdefs/etc/exception_list_sparc
@@ -850,7 +850,6 @@ usr/platform/SUNW,Netra-T5220/lib/llib-lpcp.ln sparc
usr/platform/SUNW,USBRDT-5240/lib/llib-lpcp.ln sparc
usr/platform/SUNW,Netra-T5220/lib/llib-lpcp.ln sparc
usr/platform/SUNW,Netra-T5440/lib/llib-lpcp.ln sparc
-usr/platform/SUNW,USBRDT-5440/lib/llib-lpcp.ln sparc
#
# ZFS internal tools and lint libraries
#
diff --git a/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile b/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
index bdc9a68c93..49c5c10d2f 100644
--- a/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
+++ b/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
@@ -22,8 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
TOPDIR = ../../../../..
@@ -41,7 +39,6 @@ PLATLINKS += SUNW,T5140
PLATLINKS += SUNW,USBRDT-5240
PLATLINKS += SUNW,Netra-T5220
PLATLINKS += SUNW,Netra-T5440
-PLATLINKS += SUNW,USBRDT-5440
LINKED_DIRS = $(PLATLINKS:%=$(USR_PLAT_DIR)/%)
LINKED_LIB_DIRS = $(PLATLINKS:%=$(USR_PLAT_DIR)/%/lib)
diff --git a/usr/src/uts/sun4v/Makefile b/usr/src/uts/sun4v/Makefile
index 7154452d36..5b237ea353 100644
--- a/usr/src/uts/sun4v/Makefile
+++ b/usr/src/uts/sun4v/Makefile
@@ -22,8 +22,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This makefile drives the production of all implementation architecture
# dependent modules for the sun4v architecture.
#
@@ -38,7 +36,6 @@ include Makefile.thunder
include Makefile.turgo
include Makefile.congo
include Makefile.monza
-include Makefile.lightning
USR_GLENDALE_DIR = $(USR_PLAT_DIR)/SUNW,Sun-Blade-T6320
USR_GLENDALE_SBIN_DIR = $(USR_GLENDALE_DIR)/sbin
@@ -210,9 +207,7 @@ install_platforms: $(ROOT_PSM_DIR) $(USR_PSM_DIR) \
$(USR_CONGO_DIR) $(USR_CONGO_SBIN_DIR) \
$(USR_CONGO_LIB_DIR) \
$(USR_MONZA_DIR) \
- $(USR_MONZA_SBIN_DIR) $(USR_MONZA_SBIN_LINKS) \
- $(USR_LIGHTNING_DIR) $(USR_LIGHTNING_SBIN_DIR) \
- $(USR_LIGHTNING_LIB_DIR)
+ $(USR_MONZA_SBIN_DIR) $(USR_MONZA_SBIN_LINKS)
#
@@ -300,15 +295,6 @@ $(USR_MONZA_SBIN_DIR): $(USR_MONZA_DIR)
$(USR_MONZA_SBIN_LINKS): $(USR_MONZA_SBIN_DIR)
$(INS.slink7)
-$(USR_LIGHTNING_DIR): $(USR_SUN4V_PLAT_DIR)
- -$(INS.dir.root.sys)
-
-$(USR_LIGHTNING_SBIN_DIR): $(USR_LIGHTNING_DIR)
- $(INS.slink5)
-
-$(USR_LIGHTNING_LIB_DIR): $(USR_LIGHTNING_DIR)
- -$(INS.dir.root.bin)
-
#
# Full kernel lint target.
#
diff --git a/usr/src/uts/sun4v/Makefile.lightning b/usr/src/uts/sun4v/Makefile.lightning
deleted file mode 100644
index 97f65791b1..0000000000
--- a/usr/src/uts/sun4v/Makefile.lightning
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Global definitions for sun4v lightning implementation specific modules.
-#
-
-#
-# Define directories.
-#
-
-USR_SUN4V_PLAT_DIR = $(USR_PLAT_DIR)/$(PLATFORM)
-USR_LIGHTNING_DIR = $(USR_PLAT_DIR)/SUNW,USBRDT-5440
-USR_LIGHTNING_SBIN_DIR = $(USR_LIGHTNING_DIR)/sbin
-USR_LIGHTNING_LIB_DIR = $(USR_LIGHTNING_DIR)/lib
diff --git a/usr/src/uts/sun4v/Makefile.sun4v.shared b/usr/src/uts/sun4v/Makefile.sun4v.shared
index 3dc5575b22..f8bd29cb1f 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared
@@ -23,8 +23,6 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# This makefile contains the common definitions for the sun4v unix
# and all sun4v implementation architecture dependent modules.
#
@@ -47,7 +45,6 @@ LINKED_PLATFORMS += SUNW,Netra-T5220
LINKED_PLATFORMS += SUNW,USBRDT-5240
LINKED_PLATFORMS += SUNW,Netra-T5440
LINKED_PLATFORMS += SUNW,Sun-Blade-T6340
-LINKED_PLATFORMS += SUNW,USBRDT-5440
PROMIF = ieee1275
PSMBASE = $(UTSBASE)/../psm