Sun Apr 25 23:40:52 2021 UTC ()
Handle mipsn64


(christos)
diff -r1.5 -r1.6 src/etc/etc.cobalt/Makefile.inc
diff -r1.25 -r1.26 src/etc/etc.evbmips/Makefile.inc
diff -r1.44 -r1.45 src/etc/mtree/Makefile
cvs diff -r1.5 -r1.6 src/etc/etc.cobalt/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.cobalt/Makefile.inc 2011/02/20 08:27:32 1.5
+++ src/etc/etc.cobalt/Makefile.inc 2021/04/25 23:40:51 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile.inc,v 1.5 2011/02/20 08:27:32 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.6 2021/04/25 23:40:51 christos Exp $
2# 2#
3# etc.cobalt/Makefile.inc -- cobalt-specific etc Makefile targets 3# etc.cobalt/Makefile.inc -- cobalt-specific etc Makefile targets
4# 4#
5 5
6# If you change the list of distributed kernels, don't forget 6# If you change the list of distributed kernels, don't forget
7# to update the release documentation in distrib/notes/common/contents 7# to update the release documentation in distrib/notes/common/contents
8 8
9.if ${MACHINE_ARCH} == "mips64el" 9.if !empty(MACHINE_ARCH:Mmips*64el)
10KERNEL_SETS= GENERIC32 GENERIC64 INSTALL32 INSTALL64 10KERNEL_SETS= GENERIC32 GENERIC64 INSTALL32 INSTALL64
11 11
12BUILD_KERNELS= RAMDISK32 RAMDISK64 12BUILD_KERNELS= RAMDISK32 RAMDISK64
13.else 13.else
14KERNEL_SETS= GENERIC INSTALL 14KERNEL_SETS= GENERIC INSTALL
15 15
16BUILD_KERNELS= RAMDISK 16BUILD_KERNELS= RAMDISK
17.endif 17.endif
cvs diff -r1.25 -r1.26 src/etc/etc.evbmips/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.evbmips/Makefile.inc 2020/08/15 05:03:06 1.25
+++ src/etc/etc.evbmips/Makefile.inc 2021/04/25 23:40:52 1.26
@@ -1,52 +1,52 @@ @@ -1,52 +1,52 @@
1# $NetBSD: Makefile.inc,v 1.25 2020/08/15 05:03:06 simonb Exp $ 1# $NetBSD: Makefile.inc,v 1.26 2021/04/25 23:40:52 christos Exp $
2# 2#
3# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets 3# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
4# 4#
5 5
6# If you change the list of distributed kernels, don't forget 6# If you change the list of distributed kernels, don't forget
7# to update the release documentation in distrib/notes/common/contents 7# to update the release documentation in distrib/notes/common/contents
8 8
9KERNEL_SUFFIXES= srec ub elf32 9KERNEL_SUFFIXES= srec ub elf32
10 10
11.if ${MACHINE_ARCH} == "mipsel" 11.if ${MACHINE_ARCH} == "mipsel"
12KERNEL_SETS= ALCHEMY CI20 CPMBR1400 DBAU1500 DBAU1550 GDIUM 12KERNEL_SETS= ALCHEMY CI20 CPMBR1400 DBAU1500 DBAU1550 GDIUM
13KERNEL_SETS+= MALTA MTX-1 OMSAL400 13KERNEL_SETS+= MALTA MTX-1 OMSAL400
14BUILD_KERNELS= INSTALL_CI20 INSTALL_OMSAL400 INSTALL_MALTA 14BUILD_KERNELS= INSTALL_CI20 INSTALL_OMSAL400 INSTALL_MALTA
15 15
16KERNEL_SETS+= P4032 P5064 P6032 16KERNEL_SETS+= P4032 P5064 P6032
17 17
18.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" 18.elif ${MACHINE_MIPS64}
19KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64 19KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
20BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64 20BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
21BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64 21BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
22 22
23. if ${MACHINE_ARCH} == "mips64el" 23. if !empty(MACHINE_ARCH:Mmips*64el)
24KERNEL_SETS+= P5064-64 24KERNEL_SETS+= P5064-64
25KERNEL_SETS+= LOONGSON 25KERNEL_SETS+= LOONGSON
26BUILD_KERNELS+= INSTALL_LOONGSON 26BUILD_KERNELS+= INSTALL_LOONGSON
27KERNEL_SETS+= GDIUM64 27KERNEL_SETS+= GDIUM64
28. else 28. else
29KERNEL_SETS+= OCTEON 29KERNEL_SETS+= OCTEON
30BUILD_KERNELS+= INSTALL_OCTEON 30BUILD_KERNELS+= INSTALL_OCTEON
31. endif 31. endif
32.else 32.else
33KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH 33KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH
34BUILD_KERNELS= INSTALL_MALTA 34BUILD_KERNELS= INSTALL_MALTA
35 35
36.endif 36.endif
37 37
38# SBMIPS has a kernel for all targets 38# SBMIPS has a kernel for all targets
39KERNEL_SETS+= SBMIPS${MACHINE_ARCH:S/mips//:C/e[lb]//} 39KERNEL_SETS+= SBMIPS${MACHINE_ARCH:S/mipsn//:S/mips//:C/e[lb]//}
40 40
41# Support for mkimage 41# Support for mkimage
42MKIMAGE= ${NETBSDSRCDIR}/distrib/utils/embedded/mkimage 42MKIMAGE= ${NETBSDSRCDIR}/distrib/utils/embedded/mkimage
43IMAGE.rel= ${RELEASEDIR}/${RELEASEMACHINEDIR} 43IMAGE.rel= ${RELEASEDIR}/${RELEASEMACHINEDIR}
44IMAGE.dir= ${IMAGE.rel}/binary/gzimg 44IMAGE.dir= ${IMAGE.rel}/binary/gzimg
45IMAGE.kern= ${IMAGE.rel}/binary/kernel 45IMAGE.kern= ${IMAGE.rel}/binary/kernel
46.if !empty(MACHINE_ARCH:M*eb) 46.if !empty(MACHINE_ARCH:M*eb)
47IMAGEENDIAN= be 47IMAGEENDIAN= be
48.else 48.else
49IMAGEENDIAN= le 49IMAGEENDIAN= le
50.endif 50.endif
51 51
52__mkimage: .USE 52__mkimage: .USE
@@ -58,21 +58,21 @@ __mkimage: .USE @@ -58,21 +58,21 @@ __mkimage: .USE
58 TOOL_GZIP=${TOOL_GZIP} \ 58 TOOL_GZIP=${TOOL_GZIP} \
59 TOOL_MKNOD=${TOOL_MKNOD} \ 59 TOOL_MKNOD=${TOOL_MKNOD} \
60 TOOL_PAX=${TOOL_PAX} \ 60 TOOL_PAX=${TOOL_PAX} \
61 TOOL_MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE} \ 61 TOOL_MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE} \
62 TOOL_MTREE=${TOOL_MTREE} \ 62 TOOL_MTREE=${TOOL_MTREE} \
63 HOST_SH=${HOST_SH} \ 63 HOST_SH=${HOST_SH} \
64 KERNOBJDIR=${KERNOBJDIR} \ 64 KERNOBJDIR=${KERNOBJDIR} \
65 MACHINE=${MACHINE} \ 65 MACHINE=${MACHINE} \
66 MKDTB=${MKDTB} \ 66 MKDTB=${MKDTB} \
67 ${HOST_SH} ${MKIMAGE} -h ${.TARGET:S/smp_//} -D ${DESTDIR} \ 67 ${HOST_SH} ${MKIMAGE} -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
68 -S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \ 68 -S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
69 ${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz 69 ${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
70 70
71.if ${MACHINE_ARCH} == "mips64eb" 71.if !empty(MACHINE_ARCH:Mmips*64eb)
72smp_octeon: __mkimage 72smp_octeon: __mkimage
73MKI_OPTS.smp_octeon= -K ${IMAGE.kern} 73MKI_OPTS.smp_octeon= -K ${IMAGE.kern}
74SNAP_MD_POST_DEPS+= smp_octeon 74SNAP_MD_POST_DEPS+= smp_octeon
75INSTALLATION_DIRS+= binary/gzimg 75INSTALLATION_DIRS+= binary/gzimg
76.endif 76.endif
77 77
78snap_md_post: check_DESTDIR check_RELEASEDIR snap_post .WAIT ${SNAP_MD_POST_DEPS} 78snap_md_post: check_DESTDIR check_RELEASEDIR snap_post .WAIT ${SNAP_MD_POST_DEPS}
cvs diff -r1.44 -r1.45 src/etc/mtree/Makefile (expand / switch to unified diff)

--- src/etc/mtree/Makefile 2020/06/12 14:12:20 1.44
+++ src/etc/mtree/Makefile 2021/04/25 23:40:52 1.45
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.44 2020/06/12 14:12:20 roy Exp $ 1# $NetBSD: Makefile,v 1.45 2021/04/25 23:40:52 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5EXTRA_DIST_FILES= NetBSD.dist.machine # autogenerated 5EXTRA_DIST_FILES= NetBSD.dist.machine # autogenerated
6 6
7.if ${MKX11} != "no" 7.if ${MKX11} != "no"
8EXTRA_DIST_FILES+= NetBSD.dist.Xorg 8EXTRA_DIST_FILES+= NetBSD.dist.Xorg
9.endif 9.endif
10 10
11# Derived from MACHINE_CPU, but keeping 32/64bit for most. 11# Derived from MACHINE_CPU, but keeping 32/64bit for most.
12MTREE_MACHINE_ARCH=${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips64/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/aarch64eb/aarch64/:S/or1knd/or1k/} 12MTREE_MACHINE_ARCH=${MACHINE_ARCH:C/mipse[bl]/mips/:C/mipsn?64e[bl]/mips64/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/e?arm.*/arm/:S/aarch64eb/aarch64/:S/or1knd/or1k/}
13 13
14# The compat specific files 14# The compat specific files
15 15
16.if defined(MKCOMPAT) && ${MKCOMPAT} != "no" 16.if defined(MKCOMPAT) && ${MKCOMPAT} != "no"
17.include "${NETBSDSRCDIR}/compat/archdirs.mk" 17.include "${NETBSDSRCDIR}/compat/archdirs.mk"
18.if exists(NetBSD.compat.${MTREE_MACHINE_ARCH}) 18.if exists(NetBSD.compat.${MTREE_MACHINE_ARCH})
19EXTRA_DIST_FILES+= NetBSD.compat.${MTREE_MACHINE_ARCH} 19EXTRA_DIST_FILES+= NetBSD.compat.${MTREE_MACHINE_ARCH}
20.endif 20.endif
21EXTRA_DIST_FILES+= NetBSD.dist.compat # autogenerated 21EXTRA_DIST_FILES+= NetBSD.dist.compat # autogenerated
22.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no" 22.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no"
23EXTRA_DIST_FILES+= NetBSD.dist.xcompat # autogenerated 23EXTRA_DIST_FILES+= NetBSD.dist.xcompat # autogenerated
24.endif 24.endif
25.endif 25.endif