6687732 move picl SBL plug-in into a common sun4v location

--HG--
rename : usr/src/cmd/picl/plugins/sun4v/ontario/Makefile => deleted_files/usr/src/cmd/picl/plugins/sun4v/ontario/Makefile
rename : usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/Makefile => usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile
rename : usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.c => usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c
rename : usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.h => usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.h

5 files changed, 16 insertions, 100 deletions

diff --git a/usr/src/cmd/picl/plugins/sun4v/Makefile b/usr/src/cmd/picl/plugins/sun4v/Makefile
index 8ce53cb911..8ba0c1d925 100644
--- a/usr/src/cmd/picl/plugins/sun4v/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4v/Makefile
@@ -20,7 +20,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"
@@ -30,7 +30,7 @@
 # cmd/picl/plugins/sun4v/Makefile
 #
 
-SUBDIRS= lib .WAIT snmp .WAIT mdesc pri ontario
+SUBDIRS= lib .WAIT snmp .WAIT mdesc pri piclsbl
 
 MSGSUBDIRS=	snmp
 
diff --git a/usr/src/cmd/picl/plugins/sun4v/ontario/Makefile b/usr/src/cmd/picl/plugins/sun4v/ontario/Makefile
deleted file mode 100644
index 1329594e93..0000000000
--- a/usr/src/cmd/picl/plugins/sun4v/ontario/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/picl/plugins/sun4v/ontario/Makefile
-#
-
-SUBDIRS=	piclsbl	
-
-all :=		TARGET= all
-install :=	TARGET= install
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-lint :=		TARGET= lint
-
-.KEEP_STATE:
-
-all install clean clobber lint: $(SUBDIRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
diff --git a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/Makefile b/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile
index cf53f7b8b1..92077496f7 100644
--- a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile
@@ -24,7 +24,7 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/picl/plugins/sun4v/ontario/piclsbl/Makefile
+# cmd/picl/plugins/sun4v/piclsbl/Makefile
 
 LIBRARY=	libpiclsbl.a
 VERS=		.1
@@ -41,27 +41,25 @@ SRCS=		$(OBJECTS:%.o=%.c)
 
 LINT_SRC=	$(LINTLIB:%.ln=%)	
 
-$(OBJS_DIR)/%.o:		$(SRC)/sun4v/ontario/piclsbl/%.c
+$(OBJS_DIR)/%.o:		$(SRC)/sun4v/piclsbl/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(LINTS_DIR)/%.ln:              $(SRC)/sun4v/ontario/piclsbl/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/sun4v/piclsbl/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
 
 LIBS =		$(DYNLIB)
 
-PLATFORM      =		SUNW,Sun-Fire-T200
-ROOT_PLATFORM =		$(USR_PLAT_DIR)/$(PLATFORM)
-DYNFLAGS_PLAT =		/usr/platform/\$$PLATFORM/lib/picl/plugins 
+ROOT_PLATFORM =		$(USR_PLAT_DIR)/sun4v
+DYNFLAGS_PLAT =		/usr/platform/\$$PLATFORM/lib/picl/plugins
 DYNFLAGS_SUN4V =	/usr/platform/sun4v/lib/picl/plugins
 DYNFLAGS_COM =		/usr/lib/picl/plugins
-
-ROOTLIBDIR =	$(ROOT_PLAT_PLUGINDIR)
+ROOTLIBDIR =		$(ROOT_PLAT_PLUGINDIR)
 
 CLEANFILES=	$(LINTOUT) $(LINTLIB)
 
-CPPFLAGS +=	-I$(SRC)/sun4v/ontario/piclsbl
+CPPFLAGS +=	-I$(SRC)/sun4v/piclsbl
 CPPFLAGS +=	-I$(SRC)/uts/common/sys
 CPPFLAGS +=	-I$(SRC)/lib/libpcp/common
 CPPFLAGS +=	-D_REENTRANT
@@ -75,53 +73,17 @@ LDLIBS +=	-lc -lpicltree -lumem -lnvpair
 
 LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN -v
 
-LINKED_PLATFORMS	= SUNW,Sun-Blade-T6300 SUNW,T5140
-LINKED_PLATFORMS	+= SUNW,Sun-Blade-T6320
-LINKED_PLATFORMS	+= SUNW,SPARC-Enterprise-T5120
-LINKED_PLATFORMS	+= SUNW,Netra-T5220
-LINKED_PLATFORMS	+= SUNW,USBRDT-5240
-LINKED_PLATFORMS	+= SUNW,Netra-T5440
-LINKED_PLATFORMS	+= SUNW,USBRDT-5440
-
-LINKED_DIRS		= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%)
-LINKED_LIB_DIRS		= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib)
-LINKED_PICL_DIRS	= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/picl)
-LINKED_PLUGIN_DIRS	= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/picl/plugins)
-
-LINKED_PLUGINS_DYNLIBS = $(LINKED_PLUGIN_DIRS:%=%/$(DYNLIB))
-LINKED_PLUGINS_LIBLINKS = $(LINKED_PLUGIN_DIRS:%=%/$(LIBLINKS))
-
-ONTARIO_DYNLIB_DIR = ../../../../$(PLATFORM)/lib/picl/plugins
-
 .KEEP_STATE:
 
 all: $(LIBS) $(LIBLINKS)
 
-install:	all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) \
-	$(LINKED_PLUGIN_DIRS) $(LINKED_PLUGINS_DYNLIBS) \
-	$(LINKED_PLUGINS_LIBLINKS)
+install:	all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
+
+$(ROOTLIBDIR)/$(LIBS) :	$(LIBS)
+	$(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(LIBS)
 
 $(LIBLINKS):	FRC
-	$(RM) $(LIBLINKS); $(SYMLINK) $(DYNLIB) $(LIBLINKS)
-
-# Linked platforms directory hierarchy
-$(LINKED_DIRS):
-	$(INS.dir)
-$(LINKED_LIB_DIRS): $(LINKED_DIRS)
-	$(INS.dir)
-$(LINKED_PICL_DIRS): $(LINKED_LIB_DIRS)
-	$(INS.dir)
-$(LINKED_PLUGIN_DIRS): $(LINKED_PICL_DIRS)
-	$(INS.dir)
-
-# Linked platforms links 
-$(LINKED_PLUGINS_DYNLIBS): $(LINKED_PLUGIN_DIRS)
-	$(RM) -r $@ ;\
-	$(SYMLINK) $(ONTARIO_DYNLIB_DIR)/$(DYNLIB) $@
-
-$(LINKED_PLUGINS_LIBLINKS): $(LINKED_PLUGIN_DIRS)
-	$(RM) -r $@ ;\
-	$(SYMLINK) $(ONTARIO_DYNLIB_DIR)/$(DYNLIB) $@
+	$(RM) -r $(LIBLINKS); $(SYMLINK) $(DYNLIB) $(LIBLINKS)
 
 # include library targets
 include $(SRC)/cmd/picl/plugins/Makefile.targ
diff --git a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.c b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c
index 286c571049..286c571049 100644
--- a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.c
+++ b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c
diff --git a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.h b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.h
index e9e687e12a..3a6970c0f7 100644
--- a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.h
+++ b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -45,7 +45,7 @@ typedef struct disk_lookup {
 #define	DISK_NOT_FOUND	0x01
 
 #define	PCPLIB		"libpcp.so"
-#define	LIB_PCP_PATH	"/usr/platform/SUNW,Sun-Fire-T200/lib/"
+#define	LIB_PCP_PATH	"/usr/platform/sun4v/lib/"
 #define	LED_CHANNEL	"/devices/virtual-devices@100/led@d:glvc"
 #define	PCPINIT_TIMEOUT	0x05
 #define	PCPCOMM_TIMEOUT	0x10