From 05437b55928b0f12423843a5e2121cac2a41eecd Mon Sep 17 00:00:00 2001
From: stsp <stsp@openbsd.org>
Date: Sat, 26 Mar 2022 14:25:14 +0000
Subject: [PATCH] Enable mtw(4) on i386, macppc, and arm64.

Testing by hastings@ and myself.
i386 has a media size issue, deraadt@ will sort it out.
---
 sys/arch/arm64/conf/GENERIC   | 3 ++-
 sys/arch/arm64/conf/RAMDISK   | 3 ++-
 sys/arch/i386/conf/GENERIC    | 3 ++-
 sys/arch/i386/conf/RAMDISK_CD | 3 ++-
 sys/arch/macppc/conf/GENERIC  | 3 ++-
 sys/arch/macppc/conf/RAMDISK  | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 7eed58a8a69..3441f8bfa20 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.226 2022/02/25 13:51:02 visa Exp $
+# $OpenBSD: GENERIC,v 1.227 2022/03/26 14:25:14 stsp Exp $
 #
 # GENERIC machine description file
 #
@@ -446,6 +446,7 @@ uath*		at uhub?		# Atheros AR5005UG/AR5005UX
 ural*		at uhub?		# Ralink RT2500USB
 rum*		at uhub?		# Ralink RT2501USB/RT2601USB
 run*		at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+mtw*		at uhub?		# MediaTek MT7601U
 otus*		at uhub?		# Atheros AR9001U
 athn*		at uhub?		# Atheros AR9002U
 zyd*		at uhub?		# Zydas ZD1211
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index ce2a7bdb008..8cda41b1da0 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.169 2022/03/02 12:44:48 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.170 2022/03/26 14:25:14 stsp Exp $
 
 machine		arm64
 maxusers	4
@@ -310,6 +310,7 @@ uath*		at uhub?		# Atheros AR5005UG/AR5005UX
 ural*		at uhub?		# Ralink RT2500USB
 rum*		at uhub?		# Ralink RT2501USB/RT2601USB
 run*		at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+mtw*		at uhub?		# MediaTek MT7601U
 otus*		at uhub?		# Atheros AR9001U
 athn*		at uhub?		# Atheros AR9002U
 zyd*		at uhub?		# Zydas ZD1211
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 0ae9592ef01..1c1386f2cb2 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.861 2022/02/08 17:25:11 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.862 2022/03/26 14:25:14 stsp Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -315,6 +315,7 @@ uath*	at uhub?		# Atheros AR5005UG/AR5005UX
 ural*	at uhub?		# Ralink RT2500USB
 rum*	at uhub?		# Ralink RT2501USB/RT2601USB
 run*	at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+mtw*	at uhub?		# MediaTek MT7601U
 otus*	at uhub?		# Atheros AR9001U
 athn*	at uhub?		# Atheros AR9002U
 zyd*	at uhub?		# Zydas ZD1211
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 999d7bae637..65b8acdef54 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.249 2022/01/03 02:10:57 jsg Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.250 2022/03/26 14:25:14 stsp Exp $
 
 machine		i386
 maxusers	4
@@ -105,6 +105,7 @@ wi*		at uhub?		# WaveLAN IEEE 802.11DS
 ural*		at uhub?		# Ralink RT2500
 rum*		at uhub?		# Ralink RT2501USB/RT2601USB
 run*		at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+mtw*		at uhub?		# MediaTek MT7601U
 zyd*		at uhub?		# Zydas ZD1211
 upgt*		at uhub?		# Conexant/Intersil PrismGT SoftMAC USB
 urtw*		at uhub?		# Realtek 8187
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 6cad7733d8b..0a0c0e94b51 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.276 2022/01/21 15:05:01 kn Exp $g
+#	$OpenBSD: GENERIC,v 1.277 2022/03/26 14:25:14 stsp Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -286,6 +286,7 @@ uath*	at uhub?		# Atheros AR5005UG/AR5005UX
 ural*	at uhub?		# Ralink RT2500USB
 rum*	at uhub?		# Ralink RT2501USB/RT2601USB
 run*	at uhub?		# Ralink RT2700U/RT2800U/RT3000U
+mtw*	at uhub?		# MediaTek MT7601U
 rsu*	at uhub?		# Realtek RTL8188SU/RTL8191SU/RTL8192SU
 urtwn*	at uhub?		# Realtek RTL8188CU/RTL8192CU
 otus*	at uhub?		# Atheros AR9001U
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 97877cba242..5298b608639 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.120 2020/01/24 04:44:14 krw Exp $
+#	$OpenBSD: RAMDISK,v 1.121 2022/03/26 14:25:14 stsp Exp $
 
 machine		macppc powerpc
 maxusers	4
@@ -162,6 +162,7 @@ upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
 ugl*		at uhub?		# Genesys Logic GL620USB-A host-to-host
 udav*		at uhub?		# Davicom DM9601 based Ethernet
 mos*		at uhub?		# MOSCHIP MCS7730/7830 10/100 Ethernet
+mtw*		at uhub?		# MediaTek MT7601U
 ural*		at uhub?		# Ralink RT2500
 rum*		at uhub?		# Ralink RT2501USB/RT2601USB
 urtwn*		at uhub?		# Realtek RTL8188CU/RTL8192CU
-- 
2.20.1