6299501 sun4v cscope/tags include sun4u, still references to sun4u in sun4v directory

--HG--
rename : usr/src/uts/sun4u/conf/Mapfile => usr/src/uts/sun4/conf/Mapfile

8 files changed, 3 insertions, 48 deletions

diff --git a/usr/src/uts/sun4u/conf/Mapfile b/usr/src/uts/sun4/conf/Mapfile
index 1ed243344f..1ed243344f 100644
--- a/usr/src/uts/sun4u/conf/Mapfile
+++ b/usr/src/uts/sun4/conf/Mapfile
diff --git a/usr/src/uts/sun4u/Makefile.sun4u b/usr/src/uts/sun4u/Makefile.sun4u
index bf1b28000d..0b0a8b2f6f 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u
+++ b/usr/src/uts/sun4u/Makefile.sun4u
@@ -223,7 +223,7 @@ LINT_DEFS	= -Xarch=v9
 #	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
diff --git a/usr/src/uts/sun4u/mpxu/Makefile.mpxu b/usr/src/uts/sun4u/mpxu/Makefile.mpxu
index 612f4a7085..ecffbbe961 100644
--- a/usr/src/uts/sun4u/mpxu/Makefile.mpxu
+++ b/usr/src/uts/sun4u/mpxu/Makefile.mpxu
@@ -98,19 +98,6 @@ LINTS_DIR	= $(OBJS_DIR)
 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
diff --git a/usr/src/uts/sun4u/serengeti/Makefile.serengeti b/usr/src/uts/sun4u/serengeti/Makefile.serengeti
index bdb38de08f..7c9b585de9 100644
--- a/usr/src/uts/sun4u/serengeti/Makefile.serengeti
+++ b/usr/src/uts/sun4u/serengeti/Makefile.serengeti
@@ -113,19 +113,6 @@ UNIX_O		= $(UNIX_DIR)/$(OBJS_DIR)/unix.o
 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
diff --git a/usr/src/uts/sun4u/starcat/Makefile.starcat b/usr/src/uts/sun4u/starcat/Makefile.starcat
index f84a78a47c..4c686db056 100644
--- a/usr/src/uts/sun4u/starcat/Makefile.starcat
+++ b/usr/src/uts/sun4u/starcat/Makefile.starcat
@@ -128,15 +128,6 @@ UNIX_O		= $(UNIX_DIR)/$(OBJS_DIR)/unix.o
 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
diff --git a/usr/src/uts/sun4u/starfire/Makefile.starfire b/usr/src/uts/sun4u/starfire/Makefile.starfire
index 4bfc16fc2f..e38db3cf57 100644
--- a/usr/src/uts/sun4u/starfire/Makefile.starfire
+++ b/usr/src/uts/sun4u/starfire/Makefile.starfire
@@ -108,15 +108,6 @@ UNIX_O		= $(UNIX_DIR)/$(OBJS_DIR)/unix.o
 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
diff --git a/usr/src/uts/sun4v/Makefile b/usr/src/uts/sun4v/Makefile
index 630a41dc1e..5ea8b75cbf 100644
--- a/usr/src/uts/sun4v/Makefile
+++ b/usr/src/uts/sun4v/Makefile
@@ -193,7 +193,7 @@ include ../Makefile.targ
 # 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
diff --git a/usr/src/uts/sun4v/Makefile.sun4v b/usr/src/uts/sun4v/Makefile.sun4v
index 2b83ee5c7c..dc7235ae0d 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v
+++ b/usr/src/uts/sun4v/Makefile.sun4v
@@ -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 @@ LINT_DEFS	= -Xarch=v9
 #	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