Module Name: src
Committed By: matt
Date: Wed Sep 9 02:11:55 UTC 2009
Modified Files:
src/distrib/common [matt-nb5-mips64]: Makefile.mdset
src/distrib/pmax/instkernel [matt-nb5-mips64]: Makefile
src/distrib/pmax/miniroot [matt-nb5-mips64]: Makefile.inc
src/etc/etc.pmax [matt-nb5-mips64]: Makefile.inc
Log Message:
Add support for pmax64 kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.36 -r1.36.32.1 src/distrib/pmax/instkernel/Makefile
cvs rdiff -u -r1.18 -r1.18.34.1 src/distrib/pmax/miniroot/Makefile.inc
cvs rdiff -u -r1.16 -r1.16.26.1 src/etc/etc.pmax/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.33 src/distrib/common/Makefile.mdset:1.33.8.1
--- src/distrib/common/Makefile.mdset:1.33 Mon Jul 21 10:00:52 2008
+++ src/distrib/common/Makefile.mdset Wed Sep 9 02:11:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.33 2008/07/21 10:00:52 agc Exp $
+# $NetBSD: Makefile.mdset,v 1.33.8.1 2009/09/09 02:11:54 matt Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -83,6 +83,7 @@
_KERNEL.${_K}.${_F}:= ${_F}
.endif
+.if !empty(MDSET_SUFFIXES.${_F})
.for _S _C in ${MDSET_SUFFIXES.${_F}} # {
CLEANFILES+= ${_KERNEL.${_K}.${_F}}.${_S}
@@ -106,6 +107,7 @@
.endif # }
.endfor # }
+.endif
.if !defined(MDSET_NOSYMBOLS.${_FILENAME}) && !defined(MDSET_NOSYMBOLS)
KERNELSYMS+= ${_KERNEL.${_K}.${_F}}.symbols.gz
Index: src/distrib/pmax/instkernel/Makefile
diff -u src/distrib/pmax/instkernel/Makefile:1.36 src/distrib/pmax/instkernel/Makefile:1.36.32.1
--- src/distrib/pmax/instkernel/Makefile:1.36 Mon Jan 16 00:16:44 2006
+++ src/distrib/pmax/instkernel/Makefile Wed Sep 9 02:11:54 2009
@@ -1,27 +1,33 @@
-# $NetBSD: Makefile,v 1.36 2006/01/16 00:16:44 he Exp $
+# $NetBSD: Makefile,v 1.36.32.1 2009/09/09 02:11:54 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
+.if ${MACHINE_ARCH} == "mips64el"
+SFX= 64
+.endif
+
IMAGE= diskimage
-IMAGESIZE= 2100k
-LISTS= ${.CURDIR}/list
+IMAGESIZE= 2400k
+LISTS= ${.CURDIR}/list${SFX}
MTREECONF= ${DISTRIBDIR}/common/mtree.dot
IMAGEENDIAN= le
PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs
-IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT}
+IMAGEDEPENDS= netbsd-INSTALL${SFX}.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT}
IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT}
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-MDSETTARGETS= RAMDISK ${RAMDISK} netbsd-INSTALL
+MDSETTARGETS= RAMDISK${SFX} ${RAMDISK} netbsd-INSTALL${SFX}
MDSET_RELEASEDIR= binary/kernel
-MDSET_SUFFIXES.netbsd-INSTALL= ecoff create-ecoff
-create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
+.if ${MACHINE_ARCH} == "mipsel"
+MDSET_SUFFIXES.netbsd-INSTALL${SFX}= ecoff create-ecoff
+create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
+.endif
IMAGE_RELEASEDIR= installation/diskimage
Index: src/distrib/pmax/miniroot/Makefile.inc
diff -u src/distrib/pmax/miniroot/Makefile.inc:1.18 src/distrib/pmax/miniroot/Makefile.inc:1.18.34.1
--- src/distrib/pmax/miniroot/Makefile.inc:1.18 Sat Jul 29 19:10:56 2006
+++ src/distrib/pmax/miniroot/Makefile.inc Wed Sep 9 02:11:55 2009
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.18 2006/07/29 19:10:56 ad Exp $
+# $NetBSD: Makefile.inc,v 1.18.34.1 2009/09/09 02:11:55 matt Exp $
+
+.if ${MACHINE_ARCH} == "mips64el"
+SFX= 64
+.endif
DBG= -Os
@@ -6,13 +10,17 @@
MAKEFS_FLAGS= -f 15
IMAGEENDIAN= le
MAKEDEVTARGETS= all
+LISTS= ${.CURDIR}/list ${ARCHDIR}/list${SFX}
LISTS+= ${DISTRIBDIR}/common/list.sysinst
MTREECONF+= ${.CURDIR}/mtree.usr.install
IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
${DESTDIR}/.profile ${DESTDIR}/boot.pmax \
${DESTDIR}/etc/disktab \
- ${KERNOBJDIR}/GENERIC/netbsd \
- ${KERNOBJDIR}/GENERIC/netbsd.ecoff \
+ ${KERNOBJDIR}/GENERIC${SFX}/netbsd
+
+.if ${MACHINE_ARCH} == "mipsel"
+IMAGEDEPENDS+= ${KERNOBJDIR}/GENERIC/netbsd.ecoff \
${KERNOBJDIR}/INSTALL/nfsnetbsd.ecoff
+.endif
IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${DESTDIR}/usr/mdec/bootxx_ffs
Index: src/etc/etc.pmax/Makefile.inc
diff -u src/etc/etc.pmax/Makefile.inc:1.16 src/etc/etc.pmax/Makefile.inc:1.16.26.1
--- src/etc/etc.pmax/Makefile.inc:1.16 Tue Jul 24 10:49:27 2007
+++ src/etc/etc.pmax/Makefile.inc Wed Sep 9 02:11:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2007/07/24 10:49:27 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.16.26.1 2009/09/09 02:11:54 matt Exp $
#
# etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets
#
@@ -6,10 +6,20 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
+.if ${MACHINE_ARCH} == "mipsel"
+
KERNEL_SETS= GENERIC
BUILD_KERNELS= INSTALL RAMDISK
+.else
+
+KERNEL_SETS= GENERIC64
+
+BUILD_KERNELS= INSTALL64 RAMDISK64
+
+.endif
+
INSTALLATION_DIRS+= installation/diskimage \
installation/netboot \
installation/miniroot
