6460968 Install -i fails due to fpc driver

--HG--
rename : usr/src/uts/sun4u/fpc/Makefile => usr/src/uts/sun4u/chicago/fpc/Makefile
rename : usr/src/uts/sun4u/io/fpc/fpc-impl-4u.c => usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c

8 files changed, 23 insertions, 22 deletions

diff --git a/usr/src/uts/sun4u/Makefile.files b/usr/src/uts/sun4u/Makefile.files
index 04564949c8..6a1bc667eb 100644
--- a/usr/src/uts/sun4u/Makefile.files
+++ b/usr/src/uts/sun4u/Makefile.files
@@ -85,7 +85,6 @@ ROOTNEX_OBJS	+= mach_rootnex.o
 UPA64S_OBJS	+= upa64s.o
 SYSIO_SBUS_OBJS	+= iommu.o sysioerr.o sysiosbus.o iocache.o
 PX_OBJS		+= px_asm_4u.o px_err.o px_hlib.o px_lib4u.o px_tools_4u.o
-FPC_OBJS	+= fpc-impl-4u.o
 PCI_COMMON_OBJS	+= pci.o pci_util.o pci_dma.o pci_devctl.o \
 			pci_fdvma.o pci_iommu.o pci_sc.o pci_debug.o \
 			pci_cb.o pci_ib.o pci_ecc.o pci_pbm.o pci_intr.o \
diff --git a/usr/src/uts/sun4u/Makefile.rules b/usr/src/uts/sun4u/Makefile.rules
index 5a81ff988d..941d096460 100644
--- a/usr/src/uts/sun4u/Makefile.rules
+++ b/usr/src/uts/sun4u/Makefile.rules
@@ -84,10 +84,6 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/io/px/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/io/fpc/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
 $(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/io/px/%.s
 	$(COMPILE.s) -o $@ $<
 
@@ -212,9 +208,6 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/px/%.c
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/px/%.s
 	@($(LHEAD) $(LINT.s) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/fpc/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/wrsm/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
diff --git a/usr/src/uts/sun4u/Makefile.sun4u.shared b/usr/src/uts/sun4u/Makefile.sun4u.shared
index 666dfa0327..1c48318211 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u.shared
+++ b/usr/src/uts/sun4u/Makefile.sun4u.shared
@@ -373,7 +373,6 @@ DRV_KMODS	+= rootnex sbusmem upa64s zs zsh
 DRV_KMODS	+= sbus
 DRV_KMODS	+= pcisch pcipsy simba
 DRV_KMODS	+= px
-DRV_KMODS	+= fpc
 DRV_KMODS	+= ebus
 DRV_KMODS	+= su
 DRV_KMODS	+= tod
diff --git a/usr/src/uts/sun4u/chicago/Makefile.chicago b/usr/src/uts/sun4u/chicago/Makefile.chicago
index ec44925858..dad45c56de 100644
--- a/usr/src/uts/sun4u/chicago/Makefile.chicago
+++ b/usr/src/uts/sun4u/chicago/Makefile.chicago
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -64,7 +64,7 @@ CHICAGO_OBJS	= chicago.o
 #
 #	Define modules.
 #
-CHICAGO_KMODS	= ppm platmod
+CHICAGO_KMODS	= ppm platmod fpc
 
 #
 #	Links to UltraSparc III cyrpto modules
diff --git a/usr/src/uts/sun4u/chicago/Makefile.files b/usr/src/uts/sun4u/chicago/Makefile.files
index 5e36f6bd7c..b11dff8399 100644
--- a/usr/src/uts/sun4u/chicago/Makefile.files
+++ b/usr/src/uts/sun4u/chicago/Makefile.files
@@ -2,9 +2,8 @@
 # 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.
+# 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.
@@ -21,7 +20,7 @@
 #
 #
 # uts/sun4u/chicago/Makefile.files
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,6 +31,11 @@
 #
 
 #
+# Driver modules
+#
+FPC_OBJS	+= fpc-impl-4u.o
+
+#
 # Miscellaneous
 #
 INC_PATH	+= -I$(UTSBASE)/sun4u/chicago
diff --git a/usr/src/uts/sun4u/chicago/Makefile.rules b/usr/src/uts/sun4u/chicago/Makefile.rules
index e2b40c0ef2..51c800c0d0 100644
--- a/usr/src/uts/sun4u/chicago/Makefile.rules
+++ b/usr/src/uts/sun4u/chicago/Makefile.rules
@@ -2,9 +2,8 @@
 # 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.
+# 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.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -46,9 +45,17 @@ $(OBJS_DIR)/%.o:	$(UTSBASE)/sun4u/chicago/os/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
+$(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/chicago/io/fpc/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
 #
 #	Section 1b: Lint `object' build rules
 #
 
 $(LINTS_DIR)/%.ln:	$(UTSBASE)/sun4u/chicago/os/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
+
+$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/chicago/io/fpc/%.c
+	@($(LHEAD) $(LINT.c) $< $(LTAIL))
+
diff --git a/usr/src/uts/sun4u/fpc/Makefile b/usr/src/uts/sun4u/chicago/fpc/Makefile
index f0d169d20b..688db73330 100644
--- a/usr/src/uts/sun4u/fpc/Makefile
+++ b/usr/src/uts/sun4u/chicago/fpc/Makefile
@@ -25,7 +25,7 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-#	uts/sun4u/fpc/Makefile
+#	uts/sun4u/chicago/fpc/Makefile
 #
 #	This makefile drives the production of the sun4u
 #	fire performance counter kernel module
@@ -36,7 +36,7 @@
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
 #
-UTSBASE	= ../..
+UTSBASE	= ../../..
 
 #
 #	Define the module and object file sets.
@@ -85,7 +85,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) \
 #	Include SUN4 and SUN4U specific headers files
 #
 INC_PATH	+= -I$(UTSBASE)/sun4/io/fpc
-INC_PATH	+= -I$(UTSBASE)/sun4u/io/fpc
 
 #
 # lint pass one enforcement
diff --git a/usr/src/uts/sun4u/io/fpc/fpc-impl-4u.c b/usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c
index 4899c83369..4899c83369 100644
--- a/usr/src/uts/sun4u/io/fpc/fpc-impl-4u.c
+++ b/usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c