--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/sun4/conf/Mapfile	Mon Oct 24 15:39:27 2005 -0700
@@ -0,0 +1,53 @@
+#
+# Copyright 2005 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, 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
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# Some four meg of kernel virtual address space
+# is mapped via a locked 4-meg mapping in the ITLB
+#
+text	= LOAD ?RXN V0x01000000;
+text	| .text;
+text	: $PROGBITS ?A!W;
+
+#
+# Another four meg of kernel virtual address space
+# is mapped via a locked 4-meg mapping in the DTLB
+#
+data	= LOAD ?RWX V0x01800000 A0x00400000;
+data	| .data;
+data	: $PROGBITS ?AW;
+data	: $NOBITS ?AW;
+
+reloc	= LOAD ?RW V0x0;
+reloc	: $DYNSYM;
+reloc	: $HASH;
+reloc	: .dynstr;
+reloc	: .rela.text;
+reloc	: .rela.data;
+
+note	= NOTE;
+note	: $NOTE;

--- a/usr/src/uts/sun4u/Makefile.sun4u	Mon Oct 24 07:04:46 2005 -0700
+++ b/usr/src/uts/sun4u/Makefile.sun4u	Mon Oct 24 15:39:27 2005 -0700
@@ -223,7 +223,7 @@
 #	PLATFORM_OFFSETS:	Platform specific mach_offsets.in
 #	FDOFFSETS:		fd_offsets.in
 #
-MAPFILE		 = $(UTSBASE)/$(PLATFORM)/conf/Mapfile
+MAPFILE		 = $(UTSBASE)/sun4/conf/Mapfile
 MODSTUBS	 = $(UTSBASE)/sparc/ml/modstubs.s
 GENCONST_SRC	 = $(UTSBASE)/sun4/ml/genconst.c
 OFFSETS		 = $(UTSBASE)/sun4/ml/offsets.in

--- a/usr/src/uts/sun4u/conf/Mapfile	Mon Oct 24 07:04:46 2005 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright 2005 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, 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
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-#
-# Some four meg of kernel virtual address space
-# is mapped via a locked 4-meg mapping in the ITLB
-#
-text	= LOAD ?RXN V0x01000000;
-text	| .text;
-text	: $PROGBITS ?A!W;
-
-#
-# Another four meg of kernel virtual address space
-# is mapped via a locked 4-meg mapping in the DTLB
-#
-data	= LOAD ?RWX V0x01800000 A0x00400000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
-
-reloc	= LOAD ?RW V0x0;
-reloc	: $DYNSYM;
-reloc	: $HASH;
-reloc	: .dynstr;
-reloc	: .rela.text;
-reloc	: .rela.data;
-
-note	= NOTE;
-note	: $NOTE;

--- a/usr/src/uts/sun4u/mpxu/Makefile.mpxu	Mon Oct 24 07:04:46 2005 -0700
+++ b/usr/src/uts/sun4u/mpxu/Makefile.mpxu	Mon Oct 24 15:39:27 2005 -0700
@@ -98,19 +98,6 @@
 LINT_LIB_DIR	= $(UTSBASE)/$(PLATFORM)/mpxu/lint-libs/$(OBJS_DIR)
 
 #
-#       The following must be defined for all implementations:
-#
-#       MAPFILE:        ld mapfile for the build of kernel/unix.
-#       MODSTUBS:       Module stubs source file.
-#       GENASSYM_SRC:   genassym.c
-#       FDGENASSYM_SRC: fd_genassym.c
-#
-MAPFILE		= $(UTSBASE)/sun4u/conf/Mapfile
-MODSTUBS	= $(UTSBASE)/sparc/ml/modstubs.s
-GENASSYM_SRC	= $(UTSBASE)/sun4u/ml/genassym.c
-FDGENASSYM_SRC	= $(UTSBASE)/sun/io/fd_genassym.c
-
-#
 #       Define the actual specific platforms
 #
 MACHINE_DEFS	= -D$(PLATFORM) -D_MACHDEP -DSFMMU -DMP

--- a/usr/src/uts/sun4u/serengeti/Makefile.serengeti	Mon Oct 24 07:04:46 2005 -0700
+++ b/usr/src/uts/sun4u/serengeti/Makefile.serengeti	Mon Oct 24 15:39:27 2005 -0700
@@ -113,19 +113,6 @@
 LINT_LIB	= $(LINT_LIB_DIR)/llib-lunix.ln
 
 #
-#       The following must be defined for all implementations:
-#
-#       MAPFILE:        ld mapfile for the build of kernel/unix.
-#       MODSTUBS:       Module stubs source file.
-#       GENASSYM_SRC:   genassym.c
-#       FDGENASSYM_SRC: fd_genassym.c
-#
-MAPFILE		= $(UTSBASE)/sun4u/conf/Mapfile
-MODSTUBS	= $(UTSBASE)/sparc/ml/modstubs.s
-GENASSYM_SRC	= $(UTSBASE)/sun4u/ml/genassym.c
-FDGENASSYM_SRC	= $(UTSBASE)/sun/io/fd_genassym.c
-
-#
 #       Define the actual specific platforms
 #
 MACHINE_DEFS	= -D$(PLATFORM) -D_MACHDEP -DSFMMU -DMP -DMIXEDCPU_DR_SUPPORTED

--- a/usr/src/uts/sun4u/starcat/Makefile.starcat	Mon Oct 24 07:04:46 2005 -0700
+++ b/usr/src/uts/sun4u/starcat/Makefile.starcat	Mon Oct 24 15:39:27 2005 -0700
@@ -128,15 +128,6 @@
 LINT_LIB	= $(LINT_LIB_DIR)/llib-lunix.ln
 
 #
-#	The following must be defined for all implementations:
-#
-#	MAPFILE:	ld mapfile for the build of kernel/unix.
-#	MODSTUBS:	Module stubs source file.
-#
-MAPFILE		= $(UTSBASE)/sun4u/conf/Mapfile
-MODSTUBS	= $(UTSBASE)/sparc/ml/modstubs.s
-
-#
 #	Define the actual specific platforms
 #
 MACHINE_DEFS	= -D$(PLATFORM) -D_MACHDEP -DSFMMU -DMP -DMIXEDCPU_DR_SUPPORTED

--- a/usr/src/uts/sun4u/starfire/Makefile.starfire	Mon Oct 24 07:04:46 2005 -0700
+++ b/usr/src/uts/sun4u/starfire/Makefile.starfire	Mon Oct 24 15:39:27 2005 -0700
@@ -108,15 +108,6 @@
 LINT_LIB	= $(LINT_LIB_DIR)/llib-lunix.ln
 
 #
-#	The following must be defined for all implementations:
-#
-#	MAPFILE:	ld mapfile for the build of kernel/unix.
-#	MODSTUBS:	Module stubs source file.
-#
-MAPFILE		= $(UTSBASE)/sun4u/conf/Mapfile
-MODSTUBS	= $(UTSBASE)/sparc/ml/modstubs.s
-
-#
 #	Define the actual specific platforms
 #
 MACHINE_DEFS	= -D$(PLATFORM) -D_MACHDEP -DSFMMU

--- a/usr/src/uts/sun4v/Makefile	Mon Oct 24 07:04:46 2005 -0700
+++ b/usr/src/uts/sun4v/Makefile	Mon Oct 24 15:39:27 2005 -0700
@@ -193,7 +193,7 @@
 # Cross-reference customization: build a cross-reference over all of the
 # sun4v-related directories.
 #
-XRDIRS	= ../sun4v ../sun4u ../sun4 ../sfmmu ../sparc ../sun ../common
+XRDIRS	= ../sun4v ../sun4 ../sfmmu ../sparc ../sun ../common
 XRPRUNE = i86pc
 
 cscope.out tags: FRC

--- a/usr/src/uts/sun4v/Makefile.sun4v	Mon Oct 24 07:04:46 2005 -0700
+++ b/usr/src/uts/sun4v/Makefile.sun4v	Mon Oct 24 15:39:27 2005 -0700
@@ -33,7 +33,6 @@
 #	Machine type (implementation architecture):
 #
 PLATFORM	 = sun4v
-OPLATFORM	 = sun4u
 LINKED_PLATFORMS += SUNW,Sun-Fire-T1000
 PROMIF		 = ieee1275
 PSMBASE		 = $(UTSBASE)/../psm
@@ -194,7 +193,7 @@
 #	PLATFORM_OFFSETS:	Platform specific mach_offsets.in
 #	FDOFFSETS:		fd_offsets.in
 #
-MAPFILE		 = $(UTSBASE)/$(OPLATFORM)/conf/Mapfile
+MAPFILE		 = $(UTSBASE)/sun4/conf/Mapfile
 MODSTUBS	 = $(UTSBASE)/sparc/ml/modstubs.s
 GENCONST_SRC	 = $(UTSBASE)/sun4/ml/genconst.c
 OFFSETS		 = $(UTSBASE)/sun4/ml/offsets.in