CVS commit: src/sys/arch/macppc/conf

2024-06-10 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Mon Jun 10 15:45:24 UTC 2024

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
POWERMAC_G5_11_2: Add options required for full ATF runs

- Enable MODULAR{,_DEFAULT_AUTOLOAD}.
- Switch to filesystems.config.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

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/macppc/conf/POWERMAC_G5_11_2
diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.24 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.25
--- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.24	Mon Jan 29 18:27:13 2024
+++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2	Mon Jun 10 15:45:24 2024
@@ -24,6 +24,9 @@ options 	SYSVSEM		# System V semaphores
 #options 	SEMMNU=30	# number of undo structures in system
 options 	SYSVSHM		# System V shared memory
 
+options 	MODULAR		# new style module(7) framework
+options 	MODULAR_DEFAULT_AUTOLOAD
+
 options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
@@ -50,13 +53,7 @@ include 	"conf/compat_netbsd30.config"
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
 # File systems
-file-system 	FFS		# UFS
-file-system 	MFS		# memory file system
-file-system	TMPFS		# Efficient memory file-system
-file-system 	KERNFS		# /kern
-file-system 	PROCFS		# /proc
-file-system 	NFS		# Network File System client
-file-system	PTYFS		# /dev/pts/N support
+include "conf/filesystems.config"
 
 # File system options
 #options 	APPLE_UFS	# Apple UFS support in FFS



CVS commit: src/sys/arch/macppc/conf

2024-06-10 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Mon Jun 10 15:45:24 UTC 2024

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
POWERMAC_G5_11_2: Add options required for full ATF runs

- Enable MODULAR{,_DEFAULT_AUTOLOAD}.
- Switch to filesystems.config.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys/arch/macppc/conf

2024-01-17 Thread Valery Ushakov
On Thu, Jan 18, 2024 at 06:43:21 +1100, matthew green wrote:

> > Log Message:
> > macppc: enable FFS_EI in GENERIC
> >
> > I'd say it should be enabled for anything with USB.
> >
> > ok macallan
> 
> yay.  i think we should enable it basically everywhere that it
> is not a space issue.

I think the size impact should be trivial (though I didn't measure).
The option basically guards just a couple dozens of "bit test plus
bswap call" snippets.


> USB is just one common way, but i can also modify or create my own
> images anyway, and maybe copy them over the network to my machine
> with USB...or maybe i'll setup the disk on this machine's scsi for
> that machine ;)

Yeah.  I just didn't want to open that can of yaks to shave... :)


-uwe


re: CVS commit: src/sys/arch/macppc/conf

2024-01-17 Thread matthew green
> Log Message:
> macppc: enable FFS_EI in GENERIC
>
> I'd say it should be enabled for anything with USB.
>
> ok macallan

yay.  i think we should enable it basically everywhere that it
is not a space issue.  USB is just one common way, but i can
also modify or create my own images anyway, and maybe copy them
over the network to my machine with USB...or maybe i'll setup
the disk on this machine's scsi for that machine ;)


CVS commit: src/sys/arch/macppc/conf

2024-01-17 Thread Valery Ushakov
Module Name:src
Committed By:   uwe
Date:   Wed Jan 17 13:23:30 UTC 2024

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
macppc: enable FFS_EI in GENERIC

I'd say it should be enabled for anything with USB.

ok macallan


To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 src/sys/arch/macppc/conf/GENERIC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.377 src/sys/arch/macppc/conf/GENERIC:1.378
--- src/sys/arch/macppc/conf/GENERIC:1.377	Thu Feb  9 14:09:49 2023
+++ src/sys/arch/macppc/conf/GENERIC	Wed Jan 17 13:23:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.377 2023/02/09 14:09:49 abs Exp $
+# $NetBSD: GENERIC,v 1.378 2024/01/17 13:23:30 uwe Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.377 $"
+#ident 		"GENERIC-$Revision: 1.378 $"
 
 maxusers	32
 
@@ -84,7 +84,7 @@ include "conf/filesystems.config"
 
 # File system options
 options 	APPLE_UFS	# Apple UFS support in FFS
-#options 	FFS_EI		# FFS Endian Independent support
+options 	FFS_EI		# FFS Endian Independent support
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas



CVS commit: src/sys/arch/macppc/conf

2024-01-17 Thread Valery Ushakov
Module Name:src
Committed By:   uwe
Date:   Wed Jan 17 13:23:30 UTC 2024

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
macppc: enable FFS_EI in GENERIC

I'd say it should be enabled for anything with USB.

ok macallan


To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 src/sys/arch/macppc/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2023-10-03 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Tue Oct  3 08:23:07 UTC 2023

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
add xhci


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

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/macppc/conf/POWERMAC_G5_11_2
diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.22 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.23
--- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.22	Sun Aug  7 02:52:27 2022
+++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2	Tue Oct  3 08:23:07 2023
@@ -155,9 +155,13 @@ ukphy*	at mii? phy ?			# generic unknown
 # PCI USB controllers
 ohci*	at pci? dev ? function ?	# USB Open Host Controller
 ehci*	at pci? dev ? function ?	# USB Enhanced Host Controller
+# No G5 ships with USB 3.0 but xhci 1.0 cards have been confirmed working
+# in PCIe models
+xhci*	at pci? dev ? function ?	# USB 3.0
 
 usb*	at ohci?	# USB bus support
 usb*	at ehci?	# USB bus support
+usb*	at xhci?	# USB bus support
 uhub*	at usb?		# USB Hubs
 uhub*	at uhub? port ?
 uhidev*	at uhub? port ? configuration ? interface ?	# USB HID device



CVS commit: src/sys/arch/macppc/conf

2023-10-03 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Tue Oct  3 08:23:07 UTC 2023

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
add xhci


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2023-01-25 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Thu Jan 26 00:15:48 UTC 2023

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
do some cleanup
the gm driver has been commented out for 20 years, time to remove it
while there, remove ofb and the old ADB code which have been commented out
since 2007


To generate a diff of this commit:
cvs rdiff -u -r1.375 -r1.376 src/sys/arch/macppc/conf/GENERIC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.375 src/sys/arch/macppc/conf/GENERIC:1.376
--- src/sys/arch/macppc/conf/GENERIC:1.375	Sun Aug  7 02:52:27 2022
+++ src/sys/arch/macppc/conf/GENERIC	Thu Jan 26 00:15:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.375 2022/08/07 02:52:27 simonb Exp $
+# $NetBSD: GENERIC,v 1.376 2023/01/26 00:15:47 macallan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.375 $"
+#ident 		"GENERIC-$Revision: 1.376 $"
 
 maxusers	32
 
@@ -206,7 +206,6 @@ epic*	at pci? dev ? function ?	# SMC EPI
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gem*	at pci? dev ? function ?	# gmac ethernet
-#gm*	at pci? dev ? function ?	# gmac ethernet (old)
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
 mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
@@ -242,12 +241,6 @@ siop*	at pci? dev ? function ?	# NCR 53c
 trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
 
 # Display devices
-# ofb*	at pci? dev ? function ?	# Generic Open Firmware Framebuffer
-#options 	OFB_FAKE_VGA_FB		# Allow X to mmap VGA regs
-# 
-# ofb is considered obsolete and machine-independent genfb should be used
-# instead.
-
 chipsfb*	at pci?	function ?	# C&T 65550
 gffb*		at pci?	function ?	# NVIDIA GeForce2 MX
 machfb*		at pci? function ?	# ATI Mach 64, Rage, Rage Pro
@@ -258,7 +251,6 @@ voodoofb*	at pci? function ?	# 3Dfx Vood
 
 # ATI Radeon. Still has problems on some hardware
 radeonfb*	at pci? function ?
-options 	RADEONFB_ALWAYS_ACCEL_PUTCHAR
 
 # generic PCI framebuffer, should work with everything supported by OF
 genfb*		at pci? function ?
@@ -332,18 +324,7 @@ nvram*	at obio?			# nvram
 options OBIO_SPEED_CONTROL		# CPU speed / voltage control via GPIOs
 	# and/or DFS, found on most *Book G4
 
-
-# the traditional ADB subsystem
-
-#adb*	at obio?			# Apple Desktop Bus
-#apm0	at adb?# APM emulation
-#aed*	at adb?# ADB Event Device
-#akbd*	at adb?# ADB keyboard
-#ams*	at adb?# ADB mouse
-#abtn*	at adb?
-
-# the new, improved ADB subsystem
-
+# ADB subsystem
 cuda*	at obio?		# CUDA, for Old World PowerMacs
 iic* 		at cuda?	# CUDA's IIC bus
 



CVS commit: src/sys/arch/macppc/conf

2023-01-25 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Thu Jan 26 00:15:48 UTC 2023

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
do some cleanup
the gm driver has been commented out for 20 years, time to remove it
while there, remove ofb and the old ADB code which have been commented out
since 2007


To generate a diff of this commit:
cvs rdiff -u -r1.375 -r1.376 src/sys/arch/macppc/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-07-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Jul 17 10:01:18 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: std.macppc

Log Message:
std.macppc: Nix trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/macppc/conf/std.macppc

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/macppc/conf/std.macppc
diff -u src/sys/arch/macppc/conf/std.macppc:1.26 src/sys/arch/macppc/conf/std.macppc:1.27
--- src/sys/arch/macppc/conf/std.macppc:1.26	Thu Jul 14 11:10:02 2022
+++ src/sys/arch/macppc/conf/std.macppc	Sun Jul 17 10:01:18 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: std.macppc,v 1.26 2022/07/14 11:10:02 macallan Exp $
+#	$NetBSD: std.macppc,v 1.27 2022/07/17 10:01:18 riastradh Exp $
 #
 # Standard/required options for NetBSD/macppc.
 
@@ -22,7 +22,7 @@ options 	INTSTK=0x2000
 # pose as a USB keyboard
 options 	ADBKBD_EMUL_USB
 
-# default to console switching using Command-Fn, for tradition 
+# default to console switching using Command-Fn, for tradition
 options 	ADBKBD_LAYOUT="(KB_US | KB_APPLE)"
 options 	UKBD_LAYOUT="(KB_US | KB_APPLE)"
 



CVS commit: src/sys/arch/macppc/conf

2022-07-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Jul 17 10:01:18 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: std.macppc

Log Message:
std.macppc: Nix trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/macppc/conf/std.macppc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-07-14 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Thu Jul 14 11:10:02 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: std.macppc std.macppc.g5

Log Message:
default to apple layout for both adb and usb keyboards


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/conf/std.macppc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/conf/std.macppc.g5

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/macppc/conf/std.macppc
diff -u src/sys/arch/macppc/conf/std.macppc:1.25 src/sys/arch/macppc/conf/std.macppc:1.26
--- src/sys/arch/macppc/conf/std.macppc:1.25	Sat Aug 29 23:00:10 2020
+++ src/sys/arch/macppc/conf/std.macppc	Thu Jul 14 11:10:02 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: std.macppc,v 1.25 2020/08/29 23:00:10 macallan Exp $
+#	$NetBSD: std.macppc,v 1.26 2022/07/14 11:10:02 macallan Exp $
 #
 # Standard/required options for NetBSD/macppc.
 
@@ -21,7 +21,10 @@ options 	INTSTK=0x2000
 # HID devices - for them to coexist on the same mux we tell the adbkbd driver
 # pose as a USB keyboard
 options 	ADBKBD_EMUL_USB
-options 	UKBD_LAYOUT="(KB_US | KB_APPLE)"  # for ukbd driver
+
+# default to console switching using Command-Fn, for tradition 
+options 	ADBKBD_LAYOUT="(KB_US | KB_APPLE)"
+options 	UKBD_LAYOUT="(KB_US | KB_APPLE)"
 
 # Atheros HAL options
 include "external/isc/atheros_hal/conf/std.ath_hal"

Index: src/sys/arch/macppc/conf/std.macppc.g5
diff -u src/sys/arch/macppc/conf/std.macppc.g5:1.3 src/sys/arch/macppc/conf/std.macppc.g5:1.4
--- src/sys/arch/macppc/conf/std.macppc.g5:1.3	Thu Dec 11 05:42:18 2008
+++ src/sys/arch/macppc/conf/std.macppc.g5	Thu Jul 14 11:10:02 2022
@@ -16,5 +16,7 @@ options 	EXEC_SCRIPT	# shell script supp
 
 options 	INTSTK=0x2000
 
+options 	UKBD_LAYOUT="(KB_US | KB_APPLE)"
+
 # Atheros HAL options
 include "external/isc/atheros_hal/conf/std.ath_hal"



CVS commit: src/sys/arch/macppc/conf

2022-07-14 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Thu Jul 14 11:10:02 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: std.macppc std.macppc.g5

Log Message:
default to apple layout for both adb and usb keyboards


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/conf/std.macppc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/conf/std.macppc.g5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-06-18 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Sun Jun 19 04:47:12 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5

Log Message:
we also need WSDISPLAY_COMPAT_PCVT and _SYSCONS


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/macppc/conf/POWERMAC_G5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-06-18 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Sun Jun 19 04:47:12 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5

Log Message:
we also need WSDISPLAY_COMPAT_PCVT and _SYSCONS


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/macppc/conf/POWERMAC_G5

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/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.53 src/sys/arch/macppc/conf/POWERMAC_G5:1.54
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.53	Wed Jun 15 18:19:42 2022
+++ src/sys/arch/macppc/conf/POWERMAC_G5	Sun Jun 19 04:47:12 2022
@@ -102,6 +102,8 @@ options 	INET6		# IPV6
 # wscons options
 #options 	WSEMUL_SUN			# sun terminal emulation
 options 	WSEMUL_VT100			# VT100 / VT220 emulation
+options 	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
+options 	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
 options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
 #options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
 options 	WS_DEFAULT_FG=WSCOL_BLACK



CVS commit: src/sys/arch/macppc/conf

2022-06-15 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Jun 15 18:19:42 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5

Log Message:
uncomment WSDISPLAY_COMPAT_USL
while there, add obiofan


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/conf/POWERMAC_G5

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/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.52 src/sys/arch/macppc/conf/POWERMAC_G5:1.53
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.52	Sun May 22 13:20:44 2022
+++ src/sys/arch/macppc/conf/POWERMAC_G5	Wed Jun 15 18:19:42 2022
@@ -102,7 +102,7 @@ options 	INET6		# IPV6
 # wscons options
 #options 	WSEMUL_SUN			# sun terminal emulation
 options 	WSEMUL_VT100			# VT100 / VT220 emulation
-#options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
+options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
 #options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
 options 	WS_DEFAULT_FG=WSCOL_BLACK
 options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
@@ -157,6 +157,8 @@ fcu* 		at iic?
 smusat* 	at iic?
 deq* 		at iic?
 
+obiofan* 	at obio?	# PSU fan on PowerMac7,3
+
 pmu* 		at obio?	# Apple PMU
 
 # Audio support



CVS commit: src/sys/arch/macppc/conf

2022-06-15 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Jun 15 18:19:42 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5

Log Message:
uncomment WSDISPLAY_COMPAT_USL
while there, add obiofan


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/conf/POWERMAC_G5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-05-22 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun May 22 13:20:44 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5 POWERMAC_G5_11_2

Log Message:
Sync pseudo devs crypto and swcrypto with GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/macppc/conf/POWERMAC_G5
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

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/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.51 src/sys/arch/macppc/conf/POWERMAC_G5:1.52
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.51	Tue Feb 22 17:03:48 2022
+++ src/sys/arch/macppc/conf/POWERMAC_G5	Sun May 22 13:20:44 2022
@@ -226,8 +226,8 @@ sd*	at atapibus? drive ? flags 0x	# 
 uk*	at atapibus? drive ? flags 0x	# ATAPI unknown
 
 
-#pseudo-device 	crypto			# opencrypto framework
-	# (disabled, requires generic softints)
+pseudo-device 	crypto			# /dev/crypto device
+pseudo-device	swcrypto		# software crypto implementation
 pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	md			# memory disk device
 pseudo-device	loop			# network loopback

Index: src/sys/arch/macppc/conf/POWERMAC_G5_11_2
diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.20 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.21
--- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.20	Tue Jul  7 02:39:59 2020
+++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2	Sun May 22 13:20:44 2022
@@ -182,8 +182,8 @@ cd*	at atapibus? drive ? flags 0x	# 
 sd*	at atapibus? drive ? flags 0x	# ATAPI disk drives
 uk*	at atapibus? drive ? flags 0x	# ATAPI unknown
 
-#pseudo-device 	crypto			# opencrypto framework
-	# (disabled, requires generic softints)
+pseudo-device 	crypto			# /dev/crypto device
+pseudo-device	swcrypto		# software crypto implementation
 pseudo-device	vnd		4	# disk-like interface to files
 pseudo-device	md			# memory disk device
 pseudo-device	loop			# network loopback



CVS commit: src/sys/arch/macppc/conf

2022-05-22 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun May 22 13:20:44 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5 POWERMAC_G5_11_2

Log Message:
Sync pseudo devs crypto and swcrypto with GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/macppc/conf/POWERMAC_G5
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-02-22 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Feb 22 17:03:48 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5

Log Message:
Incllude POWERMAC_G5.local if it exists


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/macppc/conf/POWERMAC_G5

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/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.50 src/sys/arch/macppc/conf/POWERMAC_G5:1.51
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.50	Sun Dec 26 16:08:20 2021
+++ src/sys/arch/macppc/conf/POWERMAC_G5	Tue Feb 22 17:03:48 2022
@@ -245,3 +245,5 @@ pseudo-device	bpfilter		# packet filter
 #options 	MEMORY_DISK_IS_ROOT		# Force root on ram-disk
 #options 	MEMORY_DISK_ROOT_SIZE=4096	# 2 Megabytes
 #options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
+
+cinclude	"arch/macppc/conf/POWERMAC_G5.local"



CVS commit: src/sys/arch/macppc/conf

2022-02-22 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Feb 22 17:03:48 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5

Log Message:
Incllude POWERMAC_G5.local if it exists


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/macppc/conf/POWERMAC_G5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-02-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Feb 16 23:20:38 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
macppc: Support *macppc* GENERIC.local, not evbarm GENERIC64.local.

Managed to fumble with a copypasta error of local commits, and
committed the one that didn't work instead of the one that did.


To generate a diff of this commit:
cvs rdiff -u -r1.373 -r1.374 src/sys/arch/macppc/conf/GENERIC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.373 src/sys/arch/macppc/conf/GENERIC:1.374
--- src/sys/arch/macppc/conf/GENERIC:1.373	Wed Feb 16 20:14:40 2022
+++ src/sys/arch/macppc/conf/GENERIC	Wed Feb 16 23:20:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.373 2022/02/16 20:14:40 riastradh Exp $
+# $NetBSD: GENERIC,v 1.374 2022/02/16 23:20:38 riastradh Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.373 $"
+#ident 		"GENERIC-$Revision: 1.374 $"
 
 maxusers	32
 
@@ -570,4 +570,4 @@ include "dev/veriexec.config"
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 
 # Pull in optional local configuration
-cinclude "arch/evbarm/conf/GENERIC64.local"
+cinclude "arch/macppc/conf/GENERIC.local"



CVS commit: src/sys/arch/macppc/conf

2022-02-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Feb 16 23:20:38 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
macppc: Support *macppc* GENERIC.local, not evbarm GENERIC64.local.

Managed to fumble with a copypasta error of local commits, and
committed the one that didn't work instead of the one that did.


To generate a diff of this commit:
cvs rdiff -u -r1.373 -r1.374 src/sys/arch/macppc/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2022-02-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Feb 16 20:14:41 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
macppc: Support GENERIC.local.


To generate a diff of this commit:
cvs rdiff -u -r1.372 -r1.373 src/sys/arch/macppc/conf/GENERIC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.372 src/sys/arch/macppc/conf/GENERIC:1.373
--- src/sys/arch/macppc/conf/GENERIC:1.372	Thu Jan 21 06:51:55 2021
+++ src/sys/arch/macppc/conf/GENERIC	Wed Feb 16 20:14:40 2022
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.372 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: GENERIC,v 1.373 2022/02/16 20:14:40 riastradh Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.372 $"
+#ident 		"GENERIC-$Revision: 1.373 $"
 
 maxusers	32
 
@@ -568,3 +568,6 @@ pseudo-device   drvctl
 include "dev/veriexec.config"
 
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
+
+# Pull in optional local configuration
+cinclude "arch/evbarm/conf/GENERIC64.local"



CVS commit: src/sys/arch/macppc/conf

2022-02-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Feb 16 20:14:41 UTC 2022

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
macppc: Support GENERIC.local.


To generate a diff of this commit:
cvs rdiff -u -r1.372 -r1.373 src/sys/arch/macppc/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2019-11-12 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Tue Nov 12 17:27:59 UTC 2019

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
add missing usb at ehci
thanks Romain Dolbeau for noticing


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

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/macppc/conf/POWERMAC_G5_11_2
diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.13 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.14
--- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.13	Wed Aug  1 20:04:12 2018
+++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2	Tue Nov 12 17:27:59 2019
@@ -143,6 +143,7 @@ ohci*	at pci? dev ? function ?	# USB Ope
 ehci*	at pci? dev ? function ?	# USB Enhanced Host Controller
 
 usb*	at ohci?	# USB bus support
+usb*	at ehci?	# USB bus support
 uhub*	at usb?		# USB Hubs
 uhub*	at uhub? port ?
 uhidev*	at uhub? port ? configuration ? interface ?	# USB HID device



CVS commit: src/sys/arch/macppc/conf

2019-11-12 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Tue Nov 12 17:27:59 UTC 2019

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
add missing usb at ehci
thanks Romain Dolbeau for noticing


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/conf/POWERMAC_G5_11_2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2019-11-01 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri Nov  1 17:55:12 UTC 2019

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
add psoc driver


To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/sys/arch/macppc/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/macppc/conf

2019-11-01 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri Nov  1 17:55:12 UTC 2019

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
add psoc driver


To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/sys/arch/macppc/conf/GENERIC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.357 src/sys/arch/macppc/conf/GENERIC:1.358
--- src/sys/arch/macppc/conf/GENERIC:1.357	Mon Sep 16 07:11:08 2019
+++ src/sys/arch/macppc/conf/GENERIC	Fri Nov  1 17:55:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.357 2019/09/16 07:11:08 macallan Exp $
+# $NetBSD: GENERIC,v 1.358 2019/11/01 17:55:12 macallan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.357 $"
+#ident 		"GENERIC-$Revision: 1.358 $"
 
 maxusers	32
 
@@ -373,6 +373,7 @@ iic*	at ki2c?
 dbcool* 	at iic?		# dbCool thermal monitor & fan control
 deq* 		at iic?		# mixer/equalizer, used by snapper
 admtemp* 	at iic?		# temperature sensor found in Mini, G5
+psoc* 		at iic?		# fan controller found in TiBooks
 videopll*	at iic?		# for valkyriefb
 sgsmix* 	at iic?		# Additional mixer found in beige G3
 # use with awacs.



CVS commit: src/sys/arch/macppc/conf

2019-09-16 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Mon Sep 16 07:11:09 UTC 2019

Modified Files:
src/sys/arch/macppc/conf: GENERIC POWERMAC

Log Message:
add ktm at adb driver


To generate a diff of this commit:
cvs rdiff -u -r1.356 -r1.357 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/macppc/conf/POWERMAC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.356 src/sys/arch/macppc/conf/GENERIC:1.357
--- src/sys/arch/macppc/conf/GENERIC:1.356	Sat Apr 27 02:00:12 2019
+++ src/sys/arch/macppc/conf/GENERIC	Mon Sep 16 07:11:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.356 2019/04/27 02:00:12 sevan Exp $
+# $NetBSD: GENERIC,v 1.357 2019/09/16 07:11:08 macallan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.356 $"
+#ident 		"GENERIC-$Revision: 1.357 $"
 
 maxusers	32
 
@@ -349,6 +349,7 @@ pmu*	at obio?		# PMU, *Books and newer P
 nadb*	at adb_bus?		# ADB bus enumerator, at cuda or pmu
 adbkbd* at nadb?		# ADB keyboard
 adbms*	at nadb?		# ADB mice and touchpads
+ktm* 	at nadb?		# Kensington Turbo Mouse
 adbbt*	at nadb?		# button device found on *Books
 
 wskbd*		at wskbddev? console ?

Index: src/sys/arch/macppc/conf/POWERMAC
diff -u src/sys/arch/macppc/conf/POWERMAC:1.70 src/sys/arch/macppc/conf/POWERMAC:1.71
--- src/sys/arch/macppc/conf/POWERMAC:1.70	Wed Aug  1 20:04:12 2018
+++ src/sys/arch/macppc/conf/POWERMAC	Mon Sep 16 07:11:08 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: POWERMAC,v 1.70 2018/08/01 20:04:12 maxv Exp $
+#	$NetBSD: POWERMAC,v 1.71 2019/09/16 07:11:08 macallan Exp $
 #
 # POWERMAC config file
 #
@@ -106,6 +106,7 @@ adbkbd* at nadb?			# ADB keyboard
 #options 	ADB_DEBUG
 #options 	ADBKBD_DEBUG
 adbms*	at nadb?
+ktm* 	at nadb?			# Kensington Turbo Mouse
 
 wskbd*	at wskbddev? console ?
 wsmouse* at wsmousedev?



CVS commit: src/sys/arch/macppc/conf

2019-09-16 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Mon Sep 16 07:11:09 UTC 2019

Modified Files:
src/sys/arch/macppc/conf: GENERIC POWERMAC

Log Message:
add ktm at adb driver


To generate a diff of this commit:
cvs rdiff -u -r1.356 -r1.357 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/macppc/conf/POWERMAC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys/arch/macppc/conf

2018-03-02 Thread Michael
Hello,

On Sat, 3 Mar 2018 00:27:51 +
"Sevan Janiyan"  wrote:

> Module Name:  src
> Committed By: sevan
> Date: Sat Mar  3 00:27:51 UTC 2018
> 
> Modified Files:
>   src/sys/arch/macppc/conf: POWERMAC_G5
> 
> Log Message:
> Return recent changes to configuration file.
> Remove legacy options previously removed e.g MACHO & softdep support
> Remove bogus numbers
> Add or update descriptions
> Keep items removed in previous commit commented out

Thanks!

have fun
Michael


Re: CVS commit: src/sys/arch/macppc/conf

2016-05-29 Thread Christos Zoulas
On May 29, 11:10am, mar...@duskware.de (Martin Husemann) wrote:
-- Subject: Re: CVS commit: src/sys/arch/macppc/conf

| On Sun, May 29, 2016 at 01:50:31AM +, Christos Zoulas wrote:
| > But the code is supposed to work both ways. How does it fail?
| > I.e. if you have wd0X in fstab and the kernel probes it as dkY,
| > the libutil code is supposed to translate wd0X into dkY.
| 
| The issue is that sysinst is not ready for it (hope to fix that shortly).

Ah, ok. Because the rest of the system handles it just fine (I tested it).

christos


Re: CVS commit: src/sys/arch/macppc/conf

2016-05-29 Thread Martin Husemann
On Sun, May 29, 2016 at 01:50:31AM +, Christos Zoulas wrote:
> But the code is supposed to work both ways. How does it fail?
> I.e. if you have wd0X in fstab and the kernel probes it as dkY,
> the libutil code is supposed to translate wd0X into dkY.

The issue is that sysinst is not ready for it (hope to fix that shortly).

Martin


Re: CVS commit: src/sys/arch/macppc/conf

2016-05-28 Thread Christos Zoulas
In article <20160528222451.beef8f...@cvs.netbsd.org>,
Sevan Janiyan  wrote:
>-=-=-=-=-=-
>
>Module Name:   src
>Committed By:  sevan
>Date:  Sat May 28 22:24:51 UTC 2016
>
>Modified Files:
>   src/sys/arch/macppc/conf: GENERIC
>
>Log Message:
>As instructed by Martin@, disable DKWEDGE_METHOD_APPLE for now as it causes a
>fresh install in a dual boot scenario to fail. This is because fstab will be
>referencing wd(4) and the kernel expecting dk(4).
>
>Closes PR port-macppc/51160

But the code is supposed to work both ways. How does it fail?
I.e. if you have wd0X in fstab and the kernel probes it as dkY,
the libutil code is supposed to translate wd0X into dkY.

christos



re: CVS commit: src/sys/arch/macppc/conf

2014-10-11 Thread matthew green

"Masao Uebayashi" writes:
> Module Name:  src
> Committed By: uebayasi
> Date: Sat Oct 11 07:03:10 UTC 2014
> 
> Modified Files:
>   src/sys/arch/macppc/conf: files.macppc
> 
> Log Message:
> Probably agp_apple is never used.

hm?  i've used this in the past, and i've got some unfinished
patches elsewhere to make this powerpc generic, not macppc
specific.


.mrg.