Module Name:src
Committed By: martin
Date: Sun Nov 5 17:17:04 UTC 2023
Modified Files:
src/sys/arch/newsmips/conf [netbsd-10]: DEJIKO GENERIC INSTALL WAPIKO
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #457):
sys/arch/newsmips/conf/GENERIC: revision 1.144
sys/arch/newsmips/conf/GENERIC: revision 1.145
sys/arch/newsmips/conf/WAPIKO: revision 1.50
sys/arch/newsmips/conf/WAPIKO: revision 1.51
sys/arch/newsmips/conf/INSTALL: revision 1.48
sys/arch/newsmips/conf/DEJIKO: revision 1.36
sys/arch/newsmips/conf/DEJIKO: revision 1.37
Use FONT_SONY12x24 for Sony fans, rather than Gallant fonts used on Sun.
Specify -fno-unwind-tables to shrink kernel binaries.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.30.1 src/sys/arch/newsmips/conf/DEJIKO
cvs rdiff -u -r1.142 -r1.142.4.1 src/sys/arch/newsmips/conf/GENERIC
cvs rdiff -u -r1.47 -r1.47.30.1 src/sys/arch/newsmips/conf/INSTALL
cvs rdiff -u -r1.49 -r1.49.30.1 src/sys/arch/newsmips/conf/WAPIKO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/newsmips/conf/DEJIKO
diff -u src/sys/arch/newsmips/conf/DEJIKO:1.35 src/sys/arch/newsmips/conf/DEJIKO:1.35.30.1
--- src/sys/arch/newsmips/conf/DEJIKO:1.35 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/newsmips/conf/DEJIKO Sun Nov 5 17:17:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: DEJIKO,v 1.35 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: DEJIKO,v 1.35.30.1 2023/11/05 17:17:03 martin Exp $
#
# Dejiko's sekai-seifuku NEWS5000 nyo.
@@ -6,6 +6,8 @@ include "arch/newsmips/conf/std.newsmip
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+makeoptions COPTS="-O2 -fno-unwind-tables"
+
maxusers 16
options news5000
@@ -45,7 +47,8 @@ include "conf/compat_netbsd14.config"
# wscons options
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
-options FONT_GALLANT12x22
+#options FONT_GALLANT12x22
+options FONT_SONY12x24
config netbsd root on ? type ?
Index: src/sys/arch/newsmips/conf/GENERIC
diff -u src/sys/arch/newsmips/conf/GENERIC:1.142 src/sys/arch/newsmips/conf/GENERIC:1.142.4.1
--- src/sys/arch/newsmips/conf/GENERIC:1.142 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/newsmips/conf/GENERIC Sun Nov 5 17:17:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.142 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.142.4.1 2023/11/05 17:17:03 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,9 @@ include "arch/newsmips/conf/std.newsmip
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.142 $"
+#ident "GENERIC-$Revision: 1.142.4.1 $"
+
+makeoptions COPTS="-O2 -fno-unwind-tables"
maxusers 16
@@ -126,7 +128,8 @@ options NFS_BOOT_DHCP
# wscons options
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
-options FONT_GALLANT12x22
+#options FONT_GALLANT12x22
+options FONT_SONY12x24
config netbsd root on ? type ?
Index: src/sys/arch/newsmips/conf/INSTALL
diff -u src/sys/arch/newsmips/conf/INSTALL:1.47 src/sys/arch/newsmips/conf/INSTALL:1.47.30.1
--- src/sys/arch/newsmips/conf/INSTALL:1.47 Thu Feb 7 04:33:58 2019
+++ src/sys/arch/newsmips/conf/INSTALL Sun Nov 5 17:17:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.47 2019/02/07 04:33:58 mrg Exp $
+# $NetBSD: INSTALL,v 1.47.30.1 2023/11/05 17:17:03 martin Exp $
#
# INSTALL kernel for RISC-NEWS
@@ -6,7 +6,7 @@ include "arch/newsmips/conf/std.newsmip
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-makeoptions COPTS="-Os -mmemcpy" # Optimise for space. Implies -O2
+makeoptions COPTS="-Os -fno-unwind-tables -mmemcpy" # Optimise for space. Implies -O2
maxusers 8
Index: src/sys/arch/newsmips/conf/WAPIKO
diff -u src/sys/arch/newsmips/conf/WAPIKO:1.49 src/sys/arch/newsmips/conf/WAPIKO:1.49.30.1
--- src/sys/arch/newsmips/conf/WAPIKO:1.49 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/newsmips/conf/WAPIKO Sun Nov 5 17:17:03 2023
@@ -1,15 +1,15 @@
#
# NEWS3400 config file
#
-# $NetBSD: WAPIKO,v 1.49 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: WAPIKO,v 1.49.30.1 2023/11/05 17:17:03 martin Exp $
#
include "arch/newsmips/conf/std.newsmips"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-maxusers 16
+makeoptions COPTS="-O2 -fno-unwind-tables"
-makeoptions COPTS="-O2 -pipe"
+maxusers 16
options news3400
options MIPS1 # R2000/R3000 support
@@ -84,7 +84,8 @@ sd* at scsibus? target ? lun ? # SCSI di
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
-options FONT_GALLANT12x22
+#options FONT_GALLANT12x22
+options FONT_SONY12x24
wsdisplay0 at fb? console ?
wskbd0 at kb? console ?