un.ifdef USB and PCI, since all our architectures (minus one) have models

which can have these busses, might as well make these distributable firmwares
available in case the drivers find devices.
ok kettenis

15 files changed, 15 insertions, 131 deletions

diff --git a/sys/dev/microcode/atmel/Makefile b/sys/dev/microcode/atmel/Makefile
index 8a5252b783b..a9b5de20efe 100644
--- a/sys/dev/microcode/atmel/Makefile
+++ b/sys/dev/microcode/atmel/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2021/05/01 16:11:15 visa Exp $
+# $OpenBSD: Makefile,v 1.26 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# USB capable systems only
-.if (${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
-    ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "sparc64")
-
 FIRM= 	atu-intersil-int atu-intersil-ext \
 	atu-rfmd-int atu-rfmd-ext \
 	atu-rfmd2958-int atu-rfmd2958-ext \
@@ -36,6 +28,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/atu-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/bnx/Makefile b/sys/dev/microcode/bnx/Makefile
index 66a9b671522..7efd2b344eb 100644
--- a/sys/dev/microcode/bnx/Makefile
+++ b/sys/dev/microcode/bnx/Makefile
@@ -1,14 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2021/05/01 16:11:15 visa Exp $
+# $OpenBSD: Makefile,v 1.7 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI capable systems only
-.if (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha") || \
-    (${MACHINE} == "amd64") || (${MACHINE} == "hppa") || \
-    (${MACHINE} == "i386") || (${MACHINE} == "sparc64")
-
 FIRM=	bnx-b06 bnx-b09 bnx-rv2p bnx-xi-rv2p bnx-xi90-rv2p
 
 PROG=	build
@@ -28,6 +23,4 @@ afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/bnx-license ${DESTDIR}/etc/firmware
 
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/cirruslogic/Makefile b/sys/dev/microcode/cirruslogic/Makefile
index ad9cc068179..253109ca5f2 100644
--- a/sys/dev/microcode/cirruslogic/Makefile
+++ b/sys/dev/microcode/cirruslogic/Makefile
@@ -1,12 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2007/04/05 23:41:20 drahn Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI capable systems only
-.if (${MACHINE} == "i386") || (${MACHINE} == "amd64")
-
 FIRM=	cs4280
 
 PROG=	build
@@ -25,6 +22,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/cs4280-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/fxp/Makefile b/sys/dev/microcode/fxp/Makefile
index b0c3cf2218a..c29809f5b73 100644
--- a/sys/dev/microcode/fxp/Makefile
+++ b/sys/dev/microcode/fxp/Makefile
@@ -1,14 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/01 16:11:15 visa Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI capable systems only
-.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
-    (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \
-    (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa")
-
 FIRM=  fxp-d101a fxp-d101b0 fxp-d101ma fxp-d101s fxp-d102 fxp-d102c fxp-d102e
 
 PROG=	build
@@ -28,6 +23,4 @@ afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/fxp-license ${DESTDIR}/etc/firmware
 
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/kue/Makefile b/sys/dev/microcode/kue/Makefile
index 1411f5121a6..7ec7d46c586 100644
--- a/sys/dev/microcode/kue/Makefile
+++ b/sys/dev/microcode/kue/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2021/05/01 16:11:15 visa Exp $
+# $OpenBSD: Makefile,v 1.19 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# USB capable systems only
-.if (${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
-    ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "sparc64")
-
 FIRM= 	kue
 
 PROG=	build
@@ -30,6 +22,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/kue-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/myx/Makefile b/sys/dev/microcode/myx/Makefile
index 19e7f4f9c12..ae022f120fb 100644
--- a/sys/dev/microcode/myx/Makefile
+++ b/sys/dev/microcode/myx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2021/05/01 16:11:15 visa Exp $
+# $OpenBSD: Makefile,v 1.6 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -6,11 +6,6 @@ CC=${HOSTCC}
 LDADD=-lz
 DPADD=${LIBZ}
 
-# full-size PCI capable systems only
-.if (${MACHINE} == "macppc") || (${MACHINE} == "alpha") || \
-    (${MACHINE} == "amd64") || (${MACHINE} == "hppa") || \
-    (${MACHINE} == "i386") || (${MACHINE} == "sparc64")
-
 FIRM=	myx-ethp_z8e myx-eth_z8e
 
 PROG=	build
@@ -30,6 +25,4 @@ afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/myx-license ${DESTDIR}/etc/firmware
 
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/ral/Makefile b/sys/dev/microcode/ral/Makefile
index f3d30509068..9a2d413386d 100644
--- a/sys/dev/microcode/ral/Makefile
+++ b/sys/dev/microcode/ral/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2021/05/01 16:11:15 visa Exp $
+# $OpenBSD: Makefile,v 1.14 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI capable systems only
-.if (${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-     ${MACHINE} == "hppa" || \
-     ${MACHINE} == "i386" || \
-     ${MACHINE} == "loongson" || ${MACHINE} == "octeon" || \
-     ${MACHINE_ARCH} == "powerpc" || \
-     ${MACHINE} == "sparc64")
-
 FIRM=	ral-rt2561 ral-rt2561s ral-rt2661 ral-rt2860 ral-rt3290
 
 PROG=	build
@@ -31,6 +23,4 @@ afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/ral-license ${DESTDIR}/etc/firmware
 
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/rum/Makefile b/sys/dev/microcode/rum/Makefile
index 28db7794f4a..6a4726ea334 100644
--- a/sys/dev/microcode/rum/Makefile
+++ b/sys/dev/microcode/rum/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2021/05/01 16:11:15 visa Exp $
+# $OpenBSD: Makefile,v 1.19 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# USB capable systems only
-.if (${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
-    ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "sparc64")
-
 FIRM=	rum-rt2573 run-rt2870 run-rt3071
 
 PROG=	build
@@ -33,6 +25,4 @@ afterinstall:
 	ln -f ${DESTDIR}/etc/firmware/rum-license \
 	    ${DESTDIR}/etc/firmware/run-license
 
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/tht/Makefile b/sys/dev/microcode/tht/Makefile
index 1f33acb63b1..fdd9d48df3f 100644
--- a/sys/dev/microcode/tht/Makefile
+++ b/sys/dev/microcode/tht/Makefile
@@ -1,14 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2021/05/01 16:11:16 visa Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI capable systems only
-.if (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha") || \
-    (${MACHINE} == "amd64") || (${MACHINE} == "hppa") || \
-    (${MACHINE} == "i386") || (${MACHINE} == "sparc64")
-
 FIRM=	tht
 
 PROG=	build
@@ -28,6 +23,4 @@ afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/tht-license ${DESTDIR}/etc/firmware
 
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/tigon/Makefile b/sys/dev/microcode/tigon/Makefile
index b69a4e044ab..c582696162d 100644
--- a/sys/dev/microcode/tigon/Makefile
+++ b/sys/dev/microcode/tigon/Makefile
@@ -1,15 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2021/05/01 16:11:16 visa Exp $
+# $OpenBSD: Makefile,v 1.11 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI & SBus capable systems only
-.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
-    (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \
-    (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE} == "hppa")
-
 FIRM= 	tigon1 tigon2
 
 PROG=	build
@@ -28,6 +22,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/tigon-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/tusb3410/Makefile b/sys/dev/microcode/tusb3410/Makefile
index eef3af14630..7c7a5d5ca52 100644
--- a/sys/dev/microcode/tusb3410/Makefile
+++ b/sys/dev/microcode/tusb3410/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2021/05/01 16:11:16 visa Exp $
+# $OpenBSD: Makefile,v 1.13 2021/10/03 00:48:45 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# USB capable systems only
-.if (${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
-    ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "sparc64")
-
 FIRM= 	tusb3410
 
 PROG=	build
@@ -30,6 +22,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/tusb3410-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/typhoon/Makefile b/sys/dev/microcode/typhoon/Makefile
index b67ed7d0c86..f2f8082db86 100644
--- a/sys/dev/microcode/typhoon/Makefile
+++ b/sys/dev/microcode/typhoon/Makefile
@@ -1,14 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/01 16:11:16 visa Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/03 00:48:46 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI capable systems only
-.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
-    (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \
-    (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa")
-
 FIRM=	3c990
 
 PROG=	build
@@ -27,6 +22,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/3c990-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/udl/Makefile b/sys/dev/microcode/udl/Makefile
index 7eba139d6f6..3898ab72d01 100644
--- a/sys/dev/microcode/udl/Makefile
+++ b/sys/dev/microcode/udl/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2021/05/01 16:11:16 visa Exp $
+# $OpenBSD: Makefile,v 1.12 2021/10/03 00:48:46 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# USB capable systems only
-.if (${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
-    ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "sparc64")
-
 FIRM=	udl_huffman
 
 PROG=	build
@@ -28,6 +20,5 @@ realinstall:
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${FIRM} ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/yds/Makefile b/sys/dev/microcode/yds/Makefile
index 45b89ff28ea..87794342185 100644
--- a/sys/dev/microcode/yds/Makefile
+++ b/sys/dev/microcode/yds/Makefile
@@ -1,14 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2021/05/01 16:11:16 visa Exp $
+# $OpenBSD: Makefile,v 1.7 2021/10/03 00:48:46 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# PCI capable systems only
-.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
-    (${MACHINE} == "alpha") || (${MACHINE} == "sparc64") || \
-    (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "hppa")
-
 FIRM= 	yds
 
 PROG=	build
@@ -27,6 +22,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/yds-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/dev/microcode/zydas/Makefile b/sys/dev/microcode/zydas/Makefile
index c75385465e1..3b39480a482 100644
--- a/sys/dev/microcode/zydas/Makefile
+++ b/sys/dev/microcode/zydas/Makefile
@@ -1,17 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2021/05/01 16:11:16 visa Exp $
+# $OpenBSD: Makefile,v 1.18 2021/10/03 00:48:46 deraadt Exp $
 
 NOPROG=
 NOMAN=
 CC=${HOSTCC}
 
-# USB capable systems only
-.if (${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
-    ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
-    ${MACHINE} == "octeon" || ${MACHINE} == "sparc64")
-
 FIRM=	zd1211 zd1211b
 
 PROG=	build
@@ -30,6 +22,5 @@ afterinstall:
 	    ${FIRM} ${DESTDIR}/etc/firmware
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/zd1211-license ${DESTDIR}/etc/firmware
-.endif
 
 .include <bsd.prog.mk>