From 10df5a1be5128d97ab1a9d1c029803885679aa2c Mon Sep 17 00:00:00 2001 From: matt Date: Sun, 20 Feb 2011 08:26:08 +0000 Subject: [PATCH] Deal with 64 bit versions of kernels --- distrib/cobalt/instkernel/Makefile | 12 ++++++---- .../evbmips/instkernel/instkernel/Makefile | 4 +++- distrib/sgimips/instkernel/Makefile | 21 ++++++++++++----- distrib/sgimips/instkernel/list64 | 4 ++++ distrib/utils/sysinst/Makefile.inc | 5 ++-- distrib/utils/sysinst/arch/evbmips/md.h | 23 +++++++++++++++---- 6 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 distrib/sgimips/instkernel/list64 diff --git a/distrib/cobalt/instkernel/Makefile b/distrib/cobalt/instkernel/Makefile index 9e6ef899e582..8176caab2f37 100644 --- a/distrib/cobalt/instkernel/Makefile +++ b/distrib/cobalt/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2008/02/02 14:06:48 tsutsui Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/20 08:26:08 matt Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -6,12 +6,16 @@ RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= RAMDISK ${RAMDISK} - +.if ${MACHINE_ARCH} == "mips64el" +SFX= 64 +.endif + +MDSETTARGETS= RAMDISK${SFX} ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel # do not strip kernels, there's no space constraints here. -MDSET_NOSTRIP.netbsd-RAMDISK= -MDSET_NOSYMBOLS.netbsd-RAMDISK= +MDSET_NOSTRIP.netbsd-RAMDISK${SFX}= +MDSET_NOSYMBOLS.netbsd-RAMDISK${SFX}= .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/evbmips/instkernel/instkernel/Makefile b/distrib/evbmips/instkernel/instkernel/Makefile index 6a300e44f9cd..99d289bac0f7 100644 --- a/distrib/evbmips/instkernel/instkernel/Makefile +++ b/distrib/evbmips/instkernel/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/12/14 01:12:05 matt Exp $ +# $NetBSD: Makefile,v 1.3 2011/02/20 08:26:09 matt Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -14,6 +14,8 @@ MDSETTARGETS+= INSTALL_MALTA ${RAMDISK} - .elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} - MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} - +MDSETTARGETS+= INSTALL_XLSATX32 ${RAMDISK} - +MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} - .else # Big endian platforms. diff --git a/distrib/sgimips/instkernel/Makefile b/distrib/sgimips/instkernel/Makefile index b8b981982b8a..7159e272aa85 100644 --- a/distrib/sgimips/instkernel/Makefile +++ b/distrib/sgimips/instkernel/Makefile @@ -1,26 +1,35 @@ -# $NetBSD: Makefile,v 1.7 2010/08/16 13:24:54 he Exp $ +# $NetBSD: Makefile,v 1.8 2011/02/20 08:26:09 matt Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" .include +.if ${MACHINE_ARCH} == "mipseb" +NX= 32 +SFX= # none +LISTS= ${.CURDIR}/list +.else +NX= 64 +SFX= .elf32 +LISTS= ${.CURDIR}/list64 +.endif + IMAGE= diskimage IMAGESIZE= 3600k -LISTS= ${.CURDIR}/list MTREECONF= ${DISTRIBDIR}/common/mtree.dot IMAGEENDIAN= be -IMAGEDEPENDS= netbsd-INSTALL32_IP2x.gz netbsd-INSTALL32_IP3x.gz RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL32_IP2x ${RAMDISK} netbsd-INSTALL32_IP2x \ - INSTALL32_IP3x ${RAMDISK} netbsd-INSTALL32_IP3x +IMAGEDEPENDS= netbsd-INSTALL${NX}_IP2x.gz netbsd-INSTALL${NX}_IP3x.gz +MDSETTARGETS= INSTALL${NX}_IP2x ${RAMDISK} netbsd-INSTALL${NX}_IP2x${SFX} \ + INSTALL${NX}_IP3x ${RAMDISK} netbsd-INSTALL${NX}_IP3x${SFX} MDSET_RELEASEDIR= binary/kernel -MDSET_SUFFIXES.netbsd-INSTALL32_IP2x=ecoff create-ecoff +MDSET_SUFFIXES.netbsd-INSTALL${NX}_IP2x=ecoff create-ecoff create-ecoff= ${OBJCOPY} --impure -O ecoff-bigmips \ -R .pdr -R .mdebug.abi32 -R .comment -R .ident \ ${.TARGET:R} ${.TARGET} diff --git a/distrib/sgimips/instkernel/list64 b/distrib/sgimips/instkernel/list64 new file mode 100644 index 000000000000..b27ba1dcb078 --- /dev/null +++ b/distrib/sgimips/instkernel/list64 @@ -0,0 +1,4 @@ +# $NetBSD: list64,v 1.2 2011/02/20 08:26:09 matt Exp $ + +COPY ${OBJDIR}/netbsd-INSTALL64_IP2x.gz netbsd +COPY ${OBJDIR}/netbsd-INSTALL64_IP3x.gz netbsd diff --git a/distrib/utils/sysinst/Makefile.inc b/distrib/utils/sysinst/Makefile.inc index 66e0583705ca..b4df6413fa47 100644 --- a/distrib/utils/sysinst/Makefile.inc +++ b/distrib/utils/sysinst/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.51 2010/02/03 15:34:38 roy Exp $ +# $NetBSD: Makefile.inc,v 1.52 2011/02/20 08:26:09 matt Exp $ # # Makefile for sysinst @@ -39,7 +39,8 @@ UNIF_AWK= ${.CURDIR}/../../unif.awk MSG_XLAT_SH= ${.CURDIR}/../../msg_xlat.sh CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \ - -DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\" + -DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\" \ + -DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} .if defined(SMALLPROG_INET6) && (${USE_INET6} != "no") CPPFLAGS+=-DINET6 diff --git a/distrib/utils/sysinst/arch/evbmips/md.h b/distrib/utils/sysinst/arch/evbmips/md.h index faaa059ba44f..2036dff42030 100644 --- a/distrib/utils/sysinst/arch/evbmips/md.h +++ b/distrib/utils/sysinst/arch/evbmips/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2007/11/12 15:07:35 jmmv Exp $ */ +/* $NetBSD: md.h,v 1.3 2011/02/20 08:26:09 matt Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,13 +50,28 @@ * Default filesets to fetch and install during installation or upgrade. * The standard sets are: base etc comp games man misc tests text */ + +#if defined(ARCH_mipsel) || defined(ARCH_mipseb) #define SET_KERNEL_1_NAME "kern-ALCHEMY" #define SET_KERNEL_2_NAME "kern-AR531X" #define SET_KERNEL_3_NAME "kern-DBAU1500" #define SET_KERNEL_4_NAME "kern-DBAU1550" -#define SET_KERNEL_5_NAME "kern-MALTA" -#define SET_KERNEL_6_NAME "kern-MTX-1" -#define SET_KERNEL_7_NAME "kern-OMSAL400" +#define SET_KERNEL_5_NAME "kern-MALTA" +#endif +#if defined(ARCH_mipsel) +#define SET_KERNEL_6_NAME "kern-MTX-1" +#define SET_KERNEL_7_NAME "kern-OMSAL400" +#endif + +#if defined(ARCH_mips64eb) || defined(ARCH_mips64el) +#define SET_KERNEL_4_NAME "kern-MALTA32" +#define SET_KERNEL_3_NAME "kern-MALTA64" +#define SET_KERNEL_2_NAME "kern-XLSATX32" +#define SET_KERNEL_1_NAME "kern-XLSATX64" +#endif + +#undef evbmips +#undef evbmips64 #define MD_SETS_SELECTED SET_SYSTEM