Module Name: src
Committed By: skrll
Date: Wed Feb 5 17:07:18 UTC 2025
Modified Files:
src/distrib/sets/lists/base: ad.riscv
src/distrib/sets/lists/debug: ad.riscv
src/etc/etc.riscv: MAKEDEV.conf
src/sys/arch/riscv/conf: majors.riscv
src/usr.sbin/ofctl: Makefile
Log Message:
risc-v: add ofctl(8) and /dev/openfirm support
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/debug/ad.riscv
cvs rdiff -u -r1.3 -r1.4 src/etc/etc.riscv/MAKEDEV.conf
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/conf/majors.riscv
cvs rdiff -u -r1.10 -r1.11 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/ad.riscv
diff -u src/distrib/sets/lists/base/ad.riscv:1.31 src/distrib/sets/lists/base/ad.riscv:1.32
--- src/distrib/sets/lists/base/ad.riscv:1.31 Thu Jul 11 20:41:05 2024
+++ src/distrib/sets/lists/base/ad.riscv Wed Feb 5 17:07:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv,v 1.31 2024/07/11 20:41:05 riastradh Exp $
+# $NetBSD: ad.riscv,v 1.32 2025/02/05 17:07:18 skrll Exp $
#
./libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
./usr/libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
@@ -11,6 +11,7 @@
./usr/lib/rv32/openssl/modules base-crypto-usr compat
./usr/lib/rv32/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
./usr/mdec/bootriscv64.efi base-sysutil-bin uefi,arch64
+./usr/sbin/ofctl base-sysutil-bin
./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share
./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share
./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share
Index: src/distrib/sets/lists/debug/ad.riscv
diff -u src/distrib/sets/lists/debug/ad.riscv:1.22 src/distrib/sets/lists/debug/ad.riscv:1.23
--- src/distrib/sets/lists/debug/ad.riscv:1.22 Thu Jul 11 08:13:49 2024
+++ src/distrib/sets/lists/debug/ad.riscv Wed Feb 5 17:07:18 2025
@@ -1,2 +1,3 @@
-# $NetBSD: ad.riscv,v 1.22 2024/07/11 08:13:49 riastradh Exp $
+# $NetBSD: ad.riscv,v 1.23 2025/02/05 17:07:18 skrll Exp $
#
+./usr/libdata/debug/usr/sbin/ofctl.debug comp-util-debug debug
Index: src/etc/etc.riscv/MAKEDEV.conf
diff -u src/etc/etc.riscv/MAKEDEV.conf:1.3 src/etc/etc.riscv/MAKEDEV.conf:1.4
--- src/etc/etc.riscv/MAKEDEV.conf:1.3 Sat Mar 23 12:34:06 2024
+++ src/etc/etc.riscv/MAKEDEV.conf Wed Feb 5 17:07:18 2025
@@ -1,13 +1,14 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2024/03/23 12:34:06 skrll Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2025/02/05 17:07:18 skrll Exp $
all_md)
makedev wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev ld0 ld1 ld2 ld3 ld4 ld5 ld6 ld7 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7
makedev tty0 tty1 tty2 tty3
makedev scsibus0 scsibus1 scsibus2 scsibus3
- makedev sysmon
- makedev kttcp
makedev bpf
+ makedev kttcp
+ makedev openfirm
+ makedev sysmon
;;
ramdisk|floppy)
Index: src/sys/arch/riscv/conf/majors.riscv
diff -u src/sys/arch/riscv/conf/majors.riscv:1.9 src/sys/arch/riscv/conf/majors.riscv:1.10
--- src/sys/arch/riscv/conf/majors.riscv:1.9 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/conf/majors.riscv Wed Feb 5 17:07:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: majors.riscv,v 1.9 2023/05/07 12:41:48 skrll Exp $
+# $NetBSD: majors.riscv,v 1.10 2025/02/05 17:07:18 skrll Exp $
#
# Device majors for RISC-V
#
@@ -27,6 +27,8 @@ device-major altq char 64 altq
device-major pci char 66 pci
device-major kttcp char 71 kttcp
+device-major openfirm char 77 openfirm
+
# obsolete, probably can be safely removed after 4.0 branch
#device-major aucom char 73 aucom
Index: src/usr.sbin/ofctl/Makefile
diff -u src/usr.sbin/ofctl/Makefile:1.10 src/usr.sbin/ofctl/Makefile:1.11
--- src/usr.sbin/ofctl/Makefile:1.10 Fri Jul 24 12:07:09 2020
+++ src/usr.sbin/ofctl/Makefile Wed Feb 5 17:07:18 2025
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $NetBSD: Makefile,v 1.10 2020/07/24 12:07:09 jmcneill Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/05 17:07:18 skrll Exp $
.include <bsd.own.mk>
@@ -9,7 +9,8 @@
|| ${MACHINE_CPU} == "arm" \
|| ${MACHINE_CPU} == "aarch64" \
|| ${MACHINE} == "sparc" \
- || ${MACHINE} == "evbmips"
+ || ${MACHINE} == "evbmips" \
+ || ${MACHINE_CPU} == "riscv"
PROG= ofctl
