[src/trunk]: src merge the rest of sbmips into evbmips. install the stand fi...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9198e12ca415
branches:  trunk
changeset: 826111:9198e12ca415
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 15 10:11:31 2017 +0000

description:
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.

diffstat:

 distrib/sets/lists/base/md.evbmips         |   7 ++++++
 etc/etc.evbmips/MAKEDEV.conf               |  24 ++++++++++++++++++--
 etc/etc.evbmips/Makefile.inc               |  12 ++++++----
 etc/mtree/Makefile                         |   6 ++++-
 etc/mtree/NetBSD.dist.evbmips              |   2 +
 sys/arch/evbmips/Makefile                  |   6 +++-
 sys/arch/evbmips/stand/Makefile            |   5 ++++
 sys/arch/evbmips/stand/sbmips/Makefile.inc |   4 +-
 usr.sbin/installboot/installboot.8         |  35 ++++++++++++++++++++++++++++-
 9 files changed, 86 insertions(+), 15 deletions(-)

diffs (226 lines):

diff -r 7d03316b9ef0 -r 9198e12ca415 distrib/sets/lists/base/md.evbmips
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/base/md.evbmips        Tue Aug 15 10:11:31 2017 +0000
@@ -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
diff -r 7d03316b9ef0 -r 9198e12ca415 etc/etc.evbmips/MAKEDEV.conf
--- a/etc/etc.evbmips/MAKEDEV.conf      Tue Aug 15 09:52:49 2017 +0000
+++ b/etc/etc.evbmips/MAKEDEV.conf      Tue Aug 15 10:11:31 2017 +0000
@@ -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 @@
        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 @@
        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
        ;;
diff -r 7d03316b9ef0 -r 9198e12ca415 etc/etc.evbmips/Makefile.inc
--- a/etc/etc.evbmips/Makefile.inc      Tue Aug 15 09:52:49 2017 +0000
+++ b/etc/etc.evbmips/Makefile.inc      Tue Aug 15 10:11:31 2017 +0000
@@ -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 @@
 
 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]//}
diff -r 7d03316b9ef0 -r 9198e12ca415 etc/mtree/Makefile
--- a/etc/mtree/Makefile        Tue Aug 15 09:52:49 2017 +0000
+++ b/etc/mtree/Makefile        Tue Aug 15 10:11:31 2017 +0000
@@ -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 @@
 .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"
diff -r 7d03316b9ef0 -r 9198e12ca415 etc/mtree/NetBSD.dist.evbmips
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.dist.evbmips     Tue Aug 15 10:11:31 2017 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: NetBSD.dist.evbmips,v 1.1 2017/08/15 10:11:31 mrg Exp $
+./usr/mdec/sbmips
diff -r 7d03316b9ef0 -r 9198e12ca415 sys/arch/evbmips/Makefile
--- a/sys/arch/evbmips/Makefile Tue Aug 15 09:52:49 2017 +0000
+++ b/sys/arch/evbmips/Makefile Tue Aug 15 10:11:31 2017 +0000
@@ -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/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 @@
            cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=        compile include
+SUBDIR=        compile include stand
 
 .include <bsd.subdir.mk>
diff -r 7d03316b9ef0 -r 9198e12ca415 sys/arch/evbmips/stand/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/stand/Makefile   Tue Aug 15 10:11:31 2017 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2017/08/15 10:11:31 mrg Exp $
+
+SUBDIR=        sbmips
+
+.include <bsd.subdir.mk>
diff -r 7d03316b9ef0 -r 9198e12ca415 sys/arch/evbmips/stand/sbmips/Makefile.inc
--- a/sys/arch/evbmips/stand/sbmips/Makefile.inc        Tue Aug 15 09:52:49 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/Makefile.inc        Tue Aug 15 10:11:31 2017 +0000
@@ -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
diff -r 7d03316b9ef0 -r 9198e12ca415 usr.sbin/installboot/installboot.8
--- a/usr.sbin/installboot/installboot.8        Tue Aug 15 09:52:49 2017 +0000
+++ b/usr.sbin/installboot/installboot.8        Tue Aug 15 10:11:31 2017 +0000
@@ -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 @@
 .
 .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