diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index a762d25a6de..9b697f087e0 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -300,7 +300,6 @@ options 	DRM_DEBUG	# Include debug printfs (slow)
 
 # bxe:  Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet
 #       adapters.
-# cxgbe: Chelsio T4/T5 1GbE/10GbE/40GbE PCIe Ethernet adapters
 # ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 #       HP PC Lan+, various PC Card devices
 #       (requires miibus)
@@ -323,7 +322,6 @@ options 	DRM_DEBUG	# Include debug printfs (slow)
 #	Requires the wpi firmware module
 
 device		bxe		# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
-device		cxgbe		# Chelsio T4/T5 1GbE/10GbE/40GbE
 device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
 options 	ED_3C503
 options 	ED_HPP
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index fa413bf861d..85a4c16b903 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -82,6 +82,7 @@ nodevice	snake_saver
 nodevice	star_saver
 nodevice	warp_saver
 
+nodevice	cxgbe
 nodevice	pcii
 nodevice	snd_cmi
 nodevice	tnt4882
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c6ccc7e8d5e..b0f18d290fe 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1917,6 +1917,8 @@ device		xmphy		# XaQti XMAC II
 # cas:	Sun Cassini/Cassini+ and National Semiconductor DP83065 Saturn
 # cm:	Arcnet SMC COM90c26 / SMC COM90c56
 #	(and SMC COM90c66 in '56 compatibility mode) adapters.
+# cxgb: Chelsio T3 based 1GbE/10GbE PCIe Ethernet adapters.
+# cxgbe:Chelsio T4 and T5 based 1GbE/10GbE/40GbE PCIe Ethernet adapters.
 # dc:   Support for PCI fast ethernet adapters based on the DEC/Intel 21143
 #       and various workalikes including:
 #       the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics
@@ -2065,6 +2067,7 @@ device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
 device		cxgb		# Chelsio T3 10 Gigabit Ethernet
 device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
+device		cxgbe		# Chelsio T4 and T5 1GbE/10GbE/40GbE
 device		dc		# DEC/Intel 21143 and various workalikes
 device		et		# Agere ET1310 10/100/Gigabit Ethernet
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index f7caa8d0bad..b2d936c4ea7 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -443,7 +443,8 @@ _ti=		ti
 _txp=		txp
 .endif
 
-.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} == "amd64"
+.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
+	${MACHINE_CPUARCH} != "powerpc"
 _cxgbe=		cxgbe
 .endif
 
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index d613ec4e257..ebfd299c484 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -57,6 +57,7 @@ device		adm1030		# Apple G4 MDD fan controller
 # Devices we don't want to deal with
 
 nodevice	bktr
+nodevice	cxgbe		# XXX: builds on powerpc64 only.
 nodevice	fdc
 nodevice	ppc
 nodevice	splash