Mon Dec 14 01:12:06 2009 UTC ()
Merge from matt-nb5-mips64
(matt)
diff -r1.4 -r1.5 src/distrib/evbmips/Makefile
diff -r1.1 -r1.2 src/distrib/evbmips/instkernel/instkernel/Makefile
diff -r1.7 -r1.8 src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -r1.37 -r1.38 src/distrib/pmax/instkernel/Makefile
diff -r0 -r1.2 src/distrib/pmax/instkernel/list64
diff -r1.20 -r1.21 src/distrib/pmax/miniroot/Makefile.inc
diff -r0 -r1.2 src/distrib/pmax/miniroot/list64
diff -r1.3 -r1.4 src/etc/etc.algor/Makefile.inc
diff -r1.11 -r1.12 src/etc/etc.evbmips/Makefile.inc
diff -r1.16 -r1.17 src/etc/etc.pmax/Makefile.inc
diff -r1.3 -r1.4 src/etc/etc.sbmips/Makefile.inc
diff -r1.18 -r1.19 src/etc/etc.sgimips/Makefile.inc
--- src/distrib/evbmips/Makefile 2007/03/07 19:42:02 1.4
+++ src/distrib/evbmips/Makefile 2009/12/14 01:12:05 1.5
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2007/03/07 19:42:02 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2009/12/14 01:12:05 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
SUBDIR= cdroms
-.if ${MACHINE_ARCH} == "mipsel"
SUBDIR+= instkernel
-.endif
TARGETS+= release
iso_image:
--- src/distrib/evbmips/instkernel/instkernel/Makefile 2006/03/30 15:45:42 1.1
+++ src/distrib/evbmips/instkernel/instkernel/Makefile 2009/12/14 01:12:05 1.2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/03/30 15:45:42 shige Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/14 01:12:05 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,9 +9,16 @@
.if ${MACHINE_ARCH} == "mipsel"
# Little endian platforms.
MDSETTARGETS= INSTALL_OMSAL400 ${RAMDISK} -
+MDSETTARGETS+= INSTALL_MALTA ${RAMDISK} -
+
+.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} -
+MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
+
.else
# Big endian platforms.
-MDSETTARGETS=
+MDSETTARGETS= INSTALL_MALTA ${RAMDISK} -
+
.endif
MDSET_RELEASEDIR= installation
MDSET_SUFFIXES.-= srec create-srec
--- src/distrib/evbmips/instkernel/ramdisk/Makefile 2009/09/20 23:19:52 1.7
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile 2009/12/14 01:12:05 1.8
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/09/20 23:19:52 abs Exp $
+# $NetBSD: Makefile,v 1.8 2009/12/14 01:12:05 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,7 @@
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
-.if ${MACHINE_ARCH} == "mipsel"
+.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mips64el"
IMAGEENDIAN= le
.else
IMAGEENDIAN= be
--- src/distrib/pmax/instkernel/Makefile 2009/01/18 12:51:25 1.37
+++ src/distrib/pmax/instkernel/Makefile 2009/12/14 01:12:06 1.38
@@ -1,27 +1,33 @@
-# $NetBSD: Makefile,v 1.37 2009/01/18 12:51:25 he Exp $
+# $NetBSD: Makefile,v 1.38 2009/12/14 01:12:06 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= 2200k
-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
# $NetBSD: list64,v 1.2 2009/12/14 01:12:06 matt Exp $
COPY ${DESTDIR}/usr/mdec/boot.pmax boot.pmax
COPY ${OBJDIR}/netbsd-INSTALL64.gz netbsd
--- src/distrib/pmax/miniroot/Makefile.inc 2009/09/20 23:19:55 1.20
+++ src/distrib/pmax/miniroot/Makefile.inc 2009/12/14 01:12:06 1.21
@@ -1,17 +1,26 @@
-# $NetBSD: Makefile.inc,v 1.20 2009/09/20 23:19:55 abs Exp $
+# $NetBSD: Makefile.inc,v 1.21 2009/12/14 01:12:06 matt Exp $
+.if ${MACHINE_ARCH} == "mips64el"
+SFX= 64
+.endif
+
DBG= -Os
IMAGESIZE= 32m
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 ${DISTRIBDIR}/common/termcap \
${DESTDIR}/.profile ${DESTDIR}/boot.pmax \
- ${KERNOBJDIR}/GENERIC/netbsd \
- ${KERNOBJDIR}/GENERIC/netbsd.ecoff \
+ ${DESTDIR}/etc/disktab \
+ ${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
# $NetBSD: list64,v 1.2 2009/12/14 01:12:06 matt Exp $
# extras in bin
PROG bin/csh
PROG bin/date
PROG bin/rcp
PROG bin/rcmd
# extras in sbin
PROG sbin/disklabel
PROG sbin/fsck_ext2fs
PROG sbin/mount_ext2fs
PROG sbin/mount_kernfs
# extras in usr/bin
PROG usr/bin/netstat
PROG usr/bin/rsh
PROG usr/bin/tset usr/bin/reset
PROG usr/bin/vi
# extras in usr/sbin
PROG usr/sbin/installboot
# crunchgen source directory specials: progs built in nonstandard places
SPECIAL vi srcdir usr.bin/nvi/build
# Minimize use of MFS
SYMLINK /tmp var/tmp
# we need the contents of /usr/mdec
COPYDIR ${DESTDIR}/usr/mdec usr/mdec
# and /boot.pmax
COPY ${DESTDIR}/boot.pmax boot.pmax
# the zoneinfo (dont use)
#COPYDIR ${DESTDIR}/usr/share/zoneinfo usr/share/zoneinfo
# a subset termcap file
COPY ${ARCHDIR}/termcap.vt100 usr/share/misc/termcap
# copy the kernel(s)
COPY ${KERNOBJDIR}/GENERIC64/netbsd netbsd
#COPY ${KERNOBJDIR}/GENERIC64/netbsd.ecoff netbsd.ecoff
#COPY ${KERNOBJDIR}/INSTALL64/nfsnetbsd.ecoff nfsnetbsd.ecoff
# various files that we need in /etc for the install
#COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
#SYMLINK /tmp/disktab.shadow etc/disktab
#SYMLINK /tmp/fstab.shadow etc/fstab
#SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
#SYMLINK /tmp/hosts etc/hosts
# sysinst needs disktab template
COPY ${DESTDIR}/etc/disktab etc/disktab.preinstall
# and the installation tools
COPY ${ARCHDIR}/dot.profile .profile
# and a spare .profile
COPY ${DESTDIR}/.profile tmp/.hdprofile
--- src/etc/etc.algor/Makefile.inc 2007/07/24 10:49:23 1.3
+++ src/etc/etc.algor/Makefile.inc 2009/12/14 01:12:05 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2007/07/24 10:49:23 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/12/14 01:12:05 matt Exp $
#
# etc.algor/Makefile.inc -- algor-specific etc Makefile targets
#
@@ -6,4 +6,8 @@
# 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= P4032 P5064
+.else
+KERNEL_SETS= P5064-64
+.endif
--- src/etc/etc.evbmips/Makefile.inc 2007/07/24 10:49:25 1.11
+++ src/etc/etc.evbmips/Makefile.inc 2009/12/14 01:12:05 1.12
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2007/07/24 10:49:25 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.12 2009/12/14 01:12:05 matt Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -10,10 +10,15 @@
.if ${MACHINE_ARCH} == "mipsel"
KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA MTX-1 OMSAL400
-BUILD_KERNELS= INSTALL_OMSAL400
+BUILD_KERNELS= INSTALL_OMSAL400 INSTALL_MALTA
+.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+KERNEL_SETS= MALTA32 MALTA64
+BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
+
.else
KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA
+BUILD_KERNELS= INSTALL_OMSAL400 INSTALL_MALTA
.endif
--- src/etc/etc.pmax/Makefile.inc 2007/07/24 10:49:27 1.16
+++ src/etc/etc.pmax/Makefile.inc 2009/12/14 01:12:05 1.17
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2007/07/24 10:49:27 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.17 2009/12/14 01:12:05 matt Exp $
#
# etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets
#
@@ -6,9 +6,19 @@
# 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 \
--- src/etc/etc.sbmips/Makefile.inc 2007/07/24 10:49:27 1.3
+++ src/etc/etc.sbmips/Makefile.inc 2009/12/14 01:12:05 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2007/07/24 10:49:27 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/12/14 01:12:05 matt Exp $
#
# etc.sbmips/Makefile.inc -- sbmips-specific etc Makefile targets
#
@@ -6,4 +6,4 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-KERNEL_SETS= GENERIC
+KERNEL_SETS= GENERIC${MACHINE_ARCH:S/mips//:C/e[lb]//}
--- src/etc/etc.sgimips/Makefile.inc 2008/10/19 22:05:20 1.18
+++ src/etc/etc.sgimips/Makefile.inc 2009/12/14 01:12:05 1.19
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2008/10/19 22:05:20 apb Exp $
+# $NetBSD: Makefile.inc,v 1.19 2009/12/14 01:12:05 matt Exp $
#
# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
#
@@ -6,19 +6,28 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-KERNEL_SETS= GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x
+.if ${MACHINE_ARCH} == "mipseb"
+SFX=32
+.else
+SFX=64
+.endif
+
+KERNEL_SETS= GENERIC${SFX}_IP2x GENERIC${SFX}_IP3x
+.if ${MACHINE_ARCH} == "mipseb"
+KERNEL_SETS= GENERIC32_IP12
KERNEL_SUFFIXES= ecoff
+.endif
#EXTRA_KERNELS= NETBOOT
-BUILD_KERNELS= INSTALL32_IP2x INSTALL32_IP3x
+BUILD_KERNELS= INSTALL${SFX}_IP2x INSTALL${SFX}_IP3x
INSTALLATION_DIRS+= installation/netboot \
installation/diskimage
iso-image-md-pre:
- cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP2x.gz ${RELEASEDIR}/ip2x
- cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP3x.gz ${RELEASEDIR}/ip3x
+ cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL${SFX}_IP2x.gz ${RELEASEDIR}/ip2x
+ cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL${SFX}_IP3x.gz ${RELEASEDIR}/ip3x
echo "ip2x/=${RELEASEDIR}/ip2x/" >> ${CDROM.pathlist}
echo "ip3x/=${RELEASEDIR}/ip3x/" >> ${CDROM.pathlist}