Module Name: src
Committed By: jmcneill
Date: Fri Jul 24 12:07:09 UTC 2020
Modified Files:
src/distrib/sets/lists/base: md.evbmips
src/etc/etc.evbmips: MAKEDEV.conf
src/sys/arch/evbmips/conf: OCTEON majors.evbmips
src/usr.sbin/ofctl: Makefile
Added Files:
src/distrib/sets/lists/debug: md.evbmips
Log Message:
evbmips: add ofctl(8) and /dev/openfirm support
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/md.evbmips
cvs rdiff -u -r0 -r1.10 src/distrib/sets/lists/debug/md.evbmips
cvs rdiff -u -r1.10 -r1.11 src/etc/etc.evbmips/MAKEDEV.conf
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/OCTEON
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbmips/conf/majors.evbmips
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/ofctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.evbmips
diff -u src/distrib/sets/lists/base/md.evbmips:1.3 src/distrib/sets/lists/base/md.evbmips:1.4
--- src/distrib/sets/lists/base/md.evbmips:1.3 Tue Aug 15 10:11:31 2017
+++ src/distrib/sets/lists/base/md.evbmips Fri Jul 24 12:07:09 2020
@@ -1,7 +1,8 @@
-# $NetBSD: md.evbmips,v 1.3 2017/08/15 10:11:31 mrg Exp $
+# $NetBSD: md.evbmips,v 1.4 2020/07/24 12:07:09 jmcneill 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
+./usr/sbin/ofctl base-sysutil-bin
Index: src/etc/etc.evbmips/MAKEDEV.conf
diff -u src/etc/etc.evbmips/MAKEDEV.conf:1.10 src/etc/etc.evbmips/MAKEDEV.conf:1.11
--- src/etc/etc.evbmips/MAKEDEV.conf:1.10 Sun Jan 27 08:53:29 2019
+++ src/etc/etc.evbmips/MAKEDEV.conf Fri Jul 24 12:07:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.10 2019/01/27 08:53:29 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.11 2020/07/24 12:07:09 jmcneill 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
@@ -35,6 +35,7 @@ all_md)
makedev altq sysmon
makedev iic0 iic1 iic2 iic3 iic4
makedev kttcp
+ makedev openfirm
;;
minimal)
Index: src/sys/arch/evbmips/conf/OCTEON
diff -u src/sys/arch/evbmips/conf/OCTEON:1.7 src/sys/arch/evbmips/conf/OCTEON:1.8
--- src/sys/arch/evbmips/conf/OCTEON:1.7 Fri Jul 17 14:57:54 2020
+++ src/sys/arch/evbmips/conf/OCTEON Fri Jul 24 12:07:09 2020
@@ -1,11 +1,11 @@
-# $NetBSD: OCTEON,v 1.7 2020/07/17 14:57:54 jmcneill Exp $
+# $NetBSD: OCTEON,v 1.8 2020/07/24 12:07:09 jmcneill Exp $
include "arch/mips/conf/std.octeon"
include "arch/evbmips/conf/files.octeon"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OCTEON-$Revision: 1.7 $"
+#ident "OCTEON-$Revision: 1.8 $"
maxusers 32
@@ -187,6 +187,7 @@ pseudo-device pty # pseudo-terminals
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
pseudo-device drvctl # driver control
+pseudo-device openfirm # /dev/openfirm
# A pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda # coda minicache <-> venus comm.
Index: src/sys/arch/evbmips/conf/majors.evbmips
diff -u src/sys/arch/evbmips/conf/majors.evbmips:1.36 src/sys/arch/evbmips/conf/majors.evbmips:1.37
--- src/sys/arch/evbmips/conf/majors.evbmips:1.36 Sat Apr 4 16:06:13 2020
+++ src/sys/arch/evbmips/conf/majors.evbmips Fri Jul 24 12:07:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: majors.evbmips,v 1.36 2020/04/04 16:06:13 jdolecek Exp $
+# $NetBSD: majors.evbmips,v 1.37 2020/07/24 12:07:09 jmcneill Exp $
#
# Device majors for evbmips
#
@@ -86,6 +86,8 @@ device-major uart char 77 uart
device-major athflash char 99 athflash
#device-major obsolete char 100 block 19 obsolete (spiflash)
+device-major openfirm char 101 openfirm
+
# Majors up to 143 are reserved for machine-dependent drivers.
# New machine-independent driver majors are assigned in
# sys/conf/majors.
Index: src/usr.sbin/ofctl/Makefile
diff -u src/usr.sbin/ofctl/Makefile:1.9 src/usr.sbin/ofctl/Makefile:1.10
--- src/usr.sbin/ofctl/Makefile:1.9 Sun Apr 1 04:35:06 2018
+++ src/usr.sbin/ofctl/Makefile Fri Jul 24 12:07:09 2020
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $NetBSD: Makefile,v 1.9 2018/04/01 04:35:06 ryo Exp $
+# $NetBSD: Makefile,v 1.10 2020/07/24 12:07:09 jmcneill Exp $
.include <bsd.own.mk>
@@ -8,7 +8,8 @@
|| ${MACHINE} == "ofppc" \
|| ${MACHINE_CPU} == "arm" \
|| ${MACHINE_CPU} == "aarch64" \
- || ${MACHINE} == "sparc"
+ || ${MACHINE} == "sparc" \
+ || ${MACHINE} == "evbmips"
PROG= ofctl
Added files:
Index: src/distrib/sets/lists/debug/md.evbmips
diff -u /dev/null src/distrib/sets/lists/debug/md.evbmips:1.10
--- /dev/null Fri Jul 24 12:07:09 2020
+++ src/distrib/sets/lists/debug/md.evbmips Fri Jul 24 12:07:09 2020
@@ -0,0 +1,2 @@
+# $NetBSD: md.evbmips,v 1.10 2020/07/24 12:07:09 jmcneill Exp $
+./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
