Index: head/sys/mips/conf/ALFA_HORNET_UB
===================================================================
--- head/sys/mips/conf/ALFA_HORNET_UB
+++ head/sys/mips/conf/ALFA_HORNET_UB
@@ -15,6 +15,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
Index: head/sys/mips/conf/AP121
===================================================================
--- head/sys/mips/conf/AP121
+++ head/sys/mips/conf/AP121
@@ -9,6 +9,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
Index: head/sys/mips/conf/AP135
===================================================================
--- head/sys/mips/conf/AP135
+++ head/sys/mips/conf/AP135
@@ -12,6 +12,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
Index: head/sys/mips/conf/AP143
===================================================================
--- head/sys/mips/conf/AP143
+++ head/sys/mips/conf/AP143
@@ -9,6 +9,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA953x parameters
 include         "QCA953X_BASE"
 
Index: head/sys/mips/conf/AP91
===================================================================
--- head/sys/mips/conf/AP91
+++ head/sys/mips/conf/AP91
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"AP91"
 hints		"AP91.hints"
Index: head/sys/mips/conf/AP93
===================================================================
--- head/sys/mips/conf/AP93
+++ head/sys/mips/conf/AP93
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"AP93"
 hints		"AP93.hints"
Index: head/sys/mips/conf/AP94
===================================================================
--- head/sys/mips/conf/AP94
+++ head/sys/mips/conf/AP94
@@ -13,6 +13,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"AP94"
 hints		"AP94.hints"
Index: head/sys/mips/conf/AP96
===================================================================
--- head/sys/mips/conf/AP96
+++ head/sys/mips/conf/AP96
@@ -13,6 +13,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"AP96"
 hints		"AP96.hints"
Index: head/sys/mips/conf/BERI_DE4_MDROOT
===================================================================
--- head/sys/mips/conf/BERI_DE4_MDROOT
+++ head/sys/mips/conf/BERI_DE4_MDROOT
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_DE4_BASE"
 
 ident		BERI_DE4_MDROOT
Index: head/sys/mips/conf/BERI_DE4_SDROOT
===================================================================
--- head/sys/mips/conf/BERI_DE4_SDROOT
+++ head/sys/mips/conf/BERI_DE4_SDROOT
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_DE4_BASE"
 
 ident		BERI_DE4_SDROOT
Index: head/sys/mips/conf/BERI_SIM_MDROOT
===================================================================
--- head/sys/mips/conf/BERI_SIM_MDROOT
+++ head/sys/mips/conf/BERI_SIM_MDROOT
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_MDROOT
Index: head/sys/mips/conf/BERI_SIM_SDROOT
===================================================================
--- head/sys/mips/conf/BERI_SIM_SDROOT
+++ head/sys/mips/conf/BERI_SIM_SDROOT
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_SDROOT
Index: head/sys/mips/conf/BERI_SIM_VIRTIO
===================================================================
--- head/sys/mips/conf/BERI_SIM_VIRTIO
+++ head/sys/mips/conf/BERI_SIM_VIRTIO
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_VIRTIO
Index: head/sys/mips/conf/CARAMBOLA2
===================================================================
--- head/sys/mips/conf/CARAMBOLA2
+++ head/sys/mips/conf/CARAMBOLA2
@@ -11,6 +11,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
Index: head/sys/mips/conf/DB120
===================================================================
--- head/sys/mips/conf/DB120
+++ head/sys/mips/conf/DB120
@@ -7,6 +7,8 @@
 # Include the default AR934x parameters
 include         "AR934X_BASE"
 
+#NO_UNIVERSE
+
 ident           DB120
 
 # Override hints with board values
Index: head/sys/mips/conf/DIR-655A1
===================================================================
--- head/sys/mips/conf/DIR-655A1
+++ head/sys/mips/conf/DIR-655A1
@@ -7,6 +7,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
Index: head/sys/mips/conf/DIR-825B1
===================================================================
--- head/sys/mips/conf/DIR-825B1
+++ head/sys/mips/conf/DIR-825B1
@@ -13,6 +13,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"DIR-825B1"
 hints		"DIR-825B1.hints"
Index: head/sys/mips/conf/DIR-825C1
===================================================================
--- head/sys/mips/conf/DIR-825C1
+++ head/sys/mips/conf/DIR-825C1
@@ -12,6 +12,8 @@
 # + 128MB RAM
 # + uboot environment
 
+#NO_UNIVERSE
+
 # Include the default AR934x parameters
 include         "AR934X_BASE"
 ident           DIR825C1
Index: head/sys/mips/conf/ENH200
===================================================================
--- head/sys/mips/conf/ENH200
+++ head/sys/mips/conf/ENH200
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"ENH200"
 hints		"ENH200.hints"
Index: head/sys/mips/conf/ONIONOMEGA
===================================================================
--- head/sys/mips/conf/ONIONOMEGA
+++ head/sys/mips/conf/ONIONOMEGA
@@ -11,6 +11,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
Index: head/sys/mips/conf/PB47
===================================================================
--- head/sys/mips/conf/PB47
+++ head/sys/mips/conf/PB47
@@ -13,6 +13,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"PB47"
 hints		"PB47.hints"
Index: head/sys/mips/conf/PICOSTATION_M2HP
===================================================================
--- head/sys/mips/conf/PICOSTATION_M2HP
+++ head/sys/mips/conf/PICOSTATION_M2HP
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"PICOSTATION_M2HP"
 hints		"PICOSTATION_M2HP.hints"
Index: head/sys/mips/conf/ROUTERSTATION
===================================================================
--- head/sys/mips/conf/ROUTERSTATION
+++ head/sys/mips/conf/ROUTERSTATION
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"ROUTERSTATION"
 hints		"ROUTERSTATION.hints"
Index: head/sys/mips/conf/ROUTERSTATION_MFS
===================================================================
--- head/sys/mips/conf/ROUTERSTATION_MFS
+++ head/sys/mips/conf/ROUTERSTATION_MFS
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"ROUTERSTATION_MFS"
 hints		"ROUTERSTATION.hints"
Index: head/sys/mips/conf/RSPRO
===================================================================
--- head/sys/mips/conf/RSPRO
+++ head/sys/mips/conf/RSPRO
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"RSPRO"
 hints		"RSPRO.hints"
Index: head/sys/mips/conf/RSPRO_MFS
===================================================================
--- head/sys/mips/conf/RSPRO_MFS
+++ head/sys/mips/conf/RSPRO_MFS
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"RSPRO_MFS"
 hints		"RSPRO.hints"
Index: head/sys/mips/conf/TL-ARCHERC7V2
===================================================================
--- head/sys/mips/conf/TL-ARCHERC7V2
+++ head/sys/mips/conf/TL-ARCHERC7V2
@@ -12,6 +12,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
Index: head/sys/mips/conf/TL-WDR4300
===================================================================
--- head/sys/mips/conf/TL-WDR4300
+++ head/sys/mips/conf/TL-WDR4300
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR934x parameters
 include         "AR934X_BASE"
 
Index: head/sys/mips/conf/TL-WR1043NDv2
===================================================================
--- head/sys/mips/conf/TL-WR1043NDv2
+++ head/sys/mips/conf/TL-WR1043NDv2
@@ -7,6 +7,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
Index: head/sys/mips/conf/TL-WR740Nv4
===================================================================
--- head/sys/mips/conf/TL-WR740Nv4
+++ head/sys/mips/conf/TL-WR740Nv4
@@ -9,6 +9,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
Index: head/sys/mips/conf/TP-MR3020
===================================================================
--- head/sys/mips/conf/TP-MR3020
+++ head/sys/mips/conf/TP-MR3020
@@ -16,6 +16,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include	"AR933X_BASE"
 
Index: head/sys/mips/conf/TP-WN1043ND
===================================================================
--- head/sys/mips/conf/TP-WN1043ND
+++ head/sys/mips/conf/TP-WN1043ND
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR913x parameters common to all AR913x SoC users.
 include         "AR91XX_BASE"
 
Index: head/sys/mips/conf/WZR-300HP
===================================================================
--- head/sys/mips/conf/WZR-300HP
+++ head/sys/mips/conf/WZR-300HP
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"WZR-300HP"
 hints		"WZR-300HP.hints"
Index: head/sys/mips/conf/WZR-HPAG300H
===================================================================
--- head/sys/mips/conf/WZR-HPAG300H
+++ head/sys/mips/conf/WZR-HPAG300H
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"WZR-HPAG300H"
 hints		"WZR-HPAG300H.hints"