Module Name: src
Committed By: mrg
Date: Tue Aug 15 10:11:31 UTC 2017
Modified Files:
src/etc/etc.evbmips: MAKEDEV.conf Makefile.inc
src/etc/mtree: Makefile
src/sys/arch/evbmips: Makefile
src/sys/arch/evbmips/stand/sbmips: Makefile.inc
src/usr.sbin/installboot: installboot.8
Added Files:
src/distrib/sets/lists/base: md.evbmips
src/etc/mtree: NetBSD.dist.evbmips
src/sys/arch/evbmips/stand: Makefile
Log Message:
merge the rest of sbmips into evbmips. install the stand files in
/usr/mdec/sbmips/ and document them in installboot(8) even though
it isn't really ported yet. also build the SBMIPS kernels.
unfortunately, sbmips has been broken since mips64 merge, but the
fix can happen in the evbmips version, which we might merge into
the older trees anyway.
XXX: releng can turn off sbmips* builds now for -current.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/base/md.evbmips
cvs rdiff -u -r1.7 -r1.8 src/etc/etc.evbmips/MAKEDEV.conf
cvs rdiff -u -r1.21 -r1.22 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r1.36 -r1.37 src/etc/mtree/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.evbmips
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/stand/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/stand/sbmips/Makefile.inc
cvs rdiff -u -r1.93 -r1.94 src/usr.sbin/installboot/installboot.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbmips/MAKEDEV.conf
diff -u src/etc/etc.evbmips/MAKEDEV.conf:1.7 src/etc/etc.evbmips/MAKEDEV.conf:1.8
--- src/etc/etc.evbmips/MAKEDEV.conf:1.7 Sat Dec 24 07:07:06 2016
+++ src/etc/etc.evbmips/MAKEDEV.conf Tue Aug 15 10:11:31 2017
@@ -1,4 +1,21 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2016/12/24 07:07:06 mrg Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2017/08/15 10:11:31 mrg Exp $
+
+# When creating a /dev file system on MFS, init makes a FS that leaves
+# only 890 (or so) inodes free. Therefore the "init" case (used by
+# init for that purpose) must be a trimmed down list.
+init)
+ makedev std wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
+ makedev tty00 tty01
+ makedev st0 st1 ch0 cd0 cd1 vnd0 vnd1
+ makedev bpf
+ makedev ccd0 md0 ch0 random
+ makedev cgd0 cgd1
+ makedev raid0
+ makedev ld0 ld1 ld2 ld3
+ makedev usbs
+ makedev ipty
+ makedev local
+ ;;
all_md)
makedev wscons sd0 sd1 sd2 sd3 sd4
@@ -7,7 +24,7 @@ all_md)
makedev ss0 ss1 uk0 uk1
makedev ld0 ld1 ld2 ld3
makedev tty00 tty01
- makedev lpa0 lpt0 audio wd0 wd1 fd0 fd1
+ makedev lpa0 lpt0 audio wd0 wd1 wd2 wd3 fd0 fd1
makedev satlink0 speaker mlx0
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
@@ -17,12 +34,13 @@ all_md)
makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
makedev altq sysmon
makedev iic0 iic1 iic2 iic3 iic4
+ makedev kttcp
;;
minimal)
makedev std
makedev sd0 sd1 sd2 sd3 opty st0 st1 ch0 cd0 cd1 ccd0 ccd1 md0
- makedev wd0 wd1 fd0 fd1
+ makedev wd0 wd1 wd2 wd3 fd0 fd1
makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7
makedev tty00 tty01 ttyE0 ttyE1 wsmouse0 wskbd0 ttyEcfg
;;
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.21 src/etc/etc.evbmips/Makefile.inc:1.22
--- src/etc/etc.evbmips/Makefile.inc:1.21 Mon Sep 5 07:23:43 2016
+++ src/etc/etc.evbmips/Makefile.inc Tue Aug 15 10:11:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2016/09/05 07:23:43 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.22 2017/08/15 10:11:31 mrg Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -15,23 +15,25 @@ BUILD_KERNELS= INSTALL_CI20 INSTALL_OMS
KERNEL_SETS+= P4032 P5064 P6032
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+. elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
-.if ${MACHINE_ARCH} == "mips64el"
+. if ${MACHINE_ARCH} == "mips64el"
KERNEL_SETS+= P5064-64
KERNEL_SETS+= LOONGSON
BUILD_KERNELS+= INSTALL_LOONGSON
KERNEL_SETS+= GDIUM64
-.else
+. else
KERNEL_SETS+= ERLITE
BUILD_KERNELS+= INSTALL_ERLITE
-.endif
+. endif
.else
KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH
BUILD_KERNELS= INSTALL_MALTA
.endif
+# SBMIPS has a kernel for all targets
+KERNEL_SETS+= SBMIPS${MACHINE_ARCH:S/mips//:C/e[lb]//}
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.36 src/etc/mtree/Makefile:1.37
--- src/etc/mtree/Makefile:1.36 Tue Nov 15 22:31:07 2016
+++ src/etc/mtree/Makefile Tue Aug 15 10:11:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/11/15 22:31:07 matt Exp $
+# $NetBSD: Makefile,v 1.37 2017/08/15 10:11:31 mrg Exp $
.include <bsd.own.mk>
@@ -21,6 +21,10 @@ EXTRA_DIST_FILES+= NetBSD.dist.xcompat #
.endif
.endif
+.if exists(NetBSD.dist.${MACHINE})
+EXTRA_DIST_FILES+= NetBSD.dist.${MACHINE}
+.endif
+
.if ${MKATF} != "no"
EXTRA_DIST_FILES+= NetBSD.dist.tests
.if defined(MKCOMPATTESTS) && ${MKCOMPATTESTS} != "no"
Index: src/sys/arch/evbmips/Makefile
diff -u src/sys/arch/evbmips/Makefile:1.8 src/sys/arch/evbmips/Makefile:1.9
--- src/sys/arch/evbmips/Makefile:1.8 Mon Apr 4 19:46:40 2011
+++ src/sys/arch/evbmips/Makefile Tue Aug 15 10:11:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/04/04 19:46:40 dyoung Exp $
+# $NetBSD: Makefile,v 1.9 2017/08/15 10:11:31 mrg Exp $
# Makefile for evbmips tags file and boot blocks
@@ -16,7 +16,9 @@ SEVBMIPS+= ${SYSDIR}/arch/evbmips/includ
SEVBMIPS+= ${SYSDIR}/arch/evbmips/isa/*.[ch]
SEVBMIPS+= ${SYSDIR}/arch/evbmips/malta/*.[ch]
SEVBMIPS+= ${SYSDIR}/arch/evbmips/rmixl/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/sbmips/*.[ch]
AEVBMIPS= ${SYSDIR}/arch/evbmips/evbmips/*.S
+AEVBMIPS+= ${SYSDIR}/arch/evbmips/sbmips/*.S
# Directories in which to place tags links
DEVBMIPS= evbmips include isa pci
@@ -38,6 +40,6 @@ links:
cd $$i && rm -f tags; ln -s ../tags tags; done
-SUBDIR= compile include
+SUBDIR= compile include stand
.include <bsd.subdir.mk>
Index: src/sys/arch/evbmips/stand/sbmips/Makefile.inc
diff -u src/sys/arch/evbmips/stand/sbmips/Makefile.inc:1.2 src/sys/arch/evbmips/stand/sbmips/Makefile.inc:1.3
--- src/sys/arch/evbmips/stand/sbmips/Makefile.inc:1.2 Mon Jul 24 10:34:54 2017
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.inc Tue Aug 15 10:11:31 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.2 2017/07/24 10:34:54 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2017/08/15 10:11:31 mrg Exp $
.include <bsd.own.mk>
-BINDIR?= /usr/mdec
+BINDIR?= /usr/mdec/sbmips
WARNS?= 1
MKMAN= no
Index: src/usr.sbin/installboot/installboot.8
diff -u src/usr.sbin/installboot/installboot.8:1.93 src/usr.sbin/installboot/installboot.8:1.94
--- src/usr.sbin/installboot/installboot.8:1.93 Mon Jul 3 21:35:30 2017
+++ src/usr.sbin/installboot/installboot.8 Tue Aug 15 10:11:31 2017
@@ -1,6 +1,6 @@
-.\" $NetBSD: installboot.8,v 1.93 2017/07/03 21:35:30 wiz Exp $
+.\" $NetBSD: installboot.8,v 1.94 2017/08/15 10:11:31 mrg Exp $
.\"
-.\" Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2002-2017 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -527,6 +527,37 @@ is not found.
.
.El
.
+.Ss Nx Ns Tn /evbmips files
+.
+The
+.Nx Ns Tn /evbmips
+bootstrap files currently only apply to the SBMIPS kernels for the
+SiByte/Broadcom BCM1250 and BCM1480 CPUs.
+.Bl -tag -width /usr/mdec/sbmips/bootxx_cd9660
+.
+.It Pa /usr/mdec/sbmips/boot
+.Nx Ns Tn /evbmips
+secondary bootstrap for
+.Sy FFSv1 ,
+.Sy FFSv2 ,
+.Sy LFSv1 ,
+and
+.Sy LFSv2 .
+.It Pa /usr/mdec/sbmips/bootxx_cd9660
+SBMIPS primary bootstrap for ISO 9660 file system.
+.It Pa /usr/mdec/sbmips/bootxx_ffs
+SBMIPS primary bootstrap for FFSv1 and FFSv2 file system.
+.It Pa /usr/mdec/sbmips/bootxx_lfs
+SBMIPS primary bootstrap for LFSv1 and LFSv2 file system.
+.It Pa /usr/mdec/sbmips/netboot
+SBMIPS primary bootstrap for network root.
+.Pp
+Note that
+.Nm
+does not currently support evbmips directly.
+.
+.El
+.
.Ss Nx Ns Tn /hppa files
.
.Bl -tag -width /usr/mdec/bootxx_ustarfs
Added files:
Index: src/distrib/sets/lists/base/md.evbmips
diff -u /dev/null src/distrib/sets/lists/base/md.evbmips:1.3
--- /dev/null Tue Aug 15 10:11:31 2017
+++ src/distrib/sets/lists/base/md.evbmips Tue Aug 15 10:11:31 2017
@@ -0,0 +1,7 @@
+# $NetBSD: md.evbmips,v 1.3 2017/08/15 10:11:31 mrg Exp $
+./usr/mdec/sbmips base-sysutil-bin
+./usr/mdec/sbmips/boot base-sysutil-bin
+./usr/mdec/sbmips/bootxx_cd9660 base-sysutil-bin
+./usr/mdec/sbmips/bootxx_ffs base-sysutil-bin
+./usr/mdec/sbmips/bootxx_lfs base-sysutil-bin
+./usr/mdec/sbmips/netboot base-sysutil-bin
Index: src/etc/mtree/NetBSD.dist.evbmips
diff -u /dev/null src/etc/mtree/NetBSD.dist.evbmips:1.1
--- /dev/null Tue Aug 15 10:11:31 2017
+++ src/etc/mtree/NetBSD.dist.evbmips Tue Aug 15 10:11:31 2017
@@ -0,0 +1,2 @@
+# $NetBSD: NetBSD.dist.evbmips,v 1.1 2017/08/15 10:11:31 mrg Exp $
+./usr/mdec/sbmips
Index: src/sys/arch/evbmips/stand/Makefile
diff -u /dev/null src/sys/arch/evbmips/stand/Makefile:1.1
--- /dev/null Tue Aug 15 10:11:31 2017
+++ src/sys/arch/evbmips/stand/Makefile Tue Aug 15 10:11:31 2017
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2017/08/15 10:11:31 mrg Exp $
+
+SUBDIR= sbmips
+
+.include <bsd.subdir.mk>
