From 29d1144aebac6cb6f9655cd57495478eeda949d3 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 19 Nov 2015 01:58:12 +0000
Subject: [PATCH] Mark the mostly redundant kernels that just pull in something
 from _BASE as NO_UNIVERSE

Differential Revision: https://reviews.freebsd.org/D4200
---
 sys/mips/conf/ALFA_HORNET_UB    | 2 ++
 sys/mips/conf/AP121             | 2 ++
 sys/mips/conf/AP135             | 2 ++
 sys/mips/conf/AP143             | 2 ++
 sys/mips/conf/AP91              | 2 ++
 sys/mips/conf/AP93              | 2 ++
 sys/mips/conf/AP94              | 2 ++
 sys/mips/conf/AP96              | 2 ++
 sys/mips/conf/BERI_DE4_MDROOT   | 2 ++
 sys/mips/conf/BERI_DE4_SDROOT   | 2 ++
 sys/mips/conf/BERI_SIM_MDROOT   | 2 ++
 sys/mips/conf/BERI_SIM_SDROOT   | 2 ++
 sys/mips/conf/BERI_SIM_VIRTIO   | 2 ++
 sys/mips/conf/CARAMBOLA2        | 2 ++
 sys/mips/conf/DB120             | 2 ++
 sys/mips/conf/DIR-655A1         | 2 ++
 sys/mips/conf/DIR-825B1         | 2 ++
 sys/mips/conf/DIR-825C1         | 2 ++
 sys/mips/conf/ENH200            | 2 ++
 sys/mips/conf/ONIONOMEGA        | 2 ++
 sys/mips/conf/PB47              | 2 ++
 sys/mips/conf/PICOSTATION_M2HP  | 2 ++
 sys/mips/conf/ROUTERSTATION     | 2 ++
 sys/mips/conf/ROUTERSTATION_MFS | 2 ++
 sys/mips/conf/RSPRO             | 2 ++
 sys/mips/conf/RSPRO_MFS         | 2 ++
 sys/mips/conf/TL-ARCHERC7V2     | 2 ++
 sys/mips/conf/TL-WDR4300        | 2 ++
 sys/mips/conf/TL-WR1043NDv2     | 2 ++
 sys/mips/conf/TL-WR740Nv4       | 2 ++
 sys/mips/conf/TP-MR3020         | 2 ++
 sys/mips/conf/TP-WN1043ND       | 2 ++
 sys/mips/conf/WZR-300HP         | 2 ++
 sys/mips/conf/WZR-HPAG300H      | 2 ++
 34 files changed, 68 insertions(+)

diff --git a/sys/mips/conf/ALFA_HORNET_UB b/sys/mips/conf/ALFA_HORNET_UB
index d1f74974344f..1986ec5ed69b 100644
--- a/sys/mips/conf/ALFA_HORNET_UB
+++ b/sys/mips/conf/ALFA_HORNET_UB
@@ -15,6 +15,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
diff --git a/sys/mips/conf/AP121 b/sys/mips/conf/AP121
index 81002d37babb..cc49be06a4c6 100644
--- a/sys/mips/conf/AP121
+++ b/sys/mips/conf/AP121
@@ -9,6 +9,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
diff --git a/sys/mips/conf/AP135 b/sys/mips/conf/AP135
index 39d2b6c94016..2807528cc777 100644
--- a/sys/mips/conf/AP135
+++ b/sys/mips/conf/AP135
@@ -12,6 +12,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
diff --git a/sys/mips/conf/AP143 b/sys/mips/conf/AP143
index 296f0c84534e..7cf72b86419e 100644
--- a/sys/mips/conf/AP143
+++ b/sys/mips/conf/AP143
@@ -9,6 +9,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA953x parameters
 include         "QCA953X_BASE"
 
diff --git a/sys/mips/conf/AP91 b/sys/mips/conf/AP91
index 42f099c468d3..58e70732b906 100644
--- a/sys/mips/conf/AP91
+++ b/sys/mips/conf/AP91
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"AP91"
 hints		"AP91.hints"
diff --git a/sys/mips/conf/AP93 b/sys/mips/conf/AP93
index 639f0eb87f51..b53bb7478087 100644
--- a/sys/mips/conf/AP93
+++ b/sys/mips/conf/AP93
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"AP93"
 hints		"AP93.hints"
diff --git a/sys/mips/conf/AP94 b/sys/mips/conf/AP94
index 505c1542cc67..c3cf700e7892 100644
--- a/sys/mips/conf/AP94
+++ b/sys/mips/conf/AP94
@@ -13,6 +13,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"AP94"
 hints		"AP94.hints"
diff --git a/sys/mips/conf/AP96 b/sys/mips/conf/AP96
index fa8b3f711cd8..ae7f9125d751 100644
--- a/sys/mips/conf/AP96
+++ b/sys/mips/conf/AP96
@@ -13,6 +13,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"AP96"
 hints		"AP96.hints"
diff --git a/sys/mips/conf/BERI_DE4_MDROOT b/sys/mips/conf/BERI_DE4_MDROOT
index 410ce78f7fd5..e088719038c4 100644
--- a/sys/mips/conf/BERI_DE4_MDROOT
+++ b/sys/mips/conf/BERI_DE4_MDROOT
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_DE4_BASE"
 
 ident		BERI_DE4_MDROOT
diff --git a/sys/mips/conf/BERI_DE4_SDROOT b/sys/mips/conf/BERI_DE4_SDROOT
index 72386f136243..7214e8c18c9e 100644
--- a/sys/mips/conf/BERI_DE4_SDROOT
+++ b/sys/mips/conf/BERI_DE4_SDROOT
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_DE4_BASE"
 
 ident		BERI_DE4_SDROOT
diff --git a/sys/mips/conf/BERI_SIM_MDROOT b/sys/mips/conf/BERI_SIM_MDROOT
index 756117347b14..032d6605634e 100644
--- a/sys/mips/conf/BERI_SIM_MDROOT
+++ b/sys/mips/conf/BERI_SIM_MDROOT
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_MDROOT
diff --git a/sys/mips/conf/BERI_SIM_SDROOT b/sys/mips/conf/BERI_SIM_SDROOT
index 7f2f82d4d3f4..b3f1689671ee 100644
--- a/sys/mips/conf/BERI_SIM_SDROOT
+++ b/sys/mips/conf/BERI_SIM_SDROOT
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_SDROOT
diff --git a/sys/mips/conf/BERI_SIM_VIRTIO b/sys/mips/conf/BERI_SIM_VIRTIO
index ecc965034ba3..34eaae2b03f5 100644
--- a/sys/mips/conf/BERI_SIM_VIRTIO
+++ b/sys/mips/conf/BERI_SIM_VIRTIO
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_VIRTIO
diff --git a/sys/mips/conf/CARAMBOLA2 b/sys/mips/conf/CARAMBOLA2
index 78c212a898f7..b5b419ae7d11 100644
--- a/sys/mips/conf/CARAMBOLA2
+++ b/sys/mips/conf/CARAMBOLA2
@@ -11,6 +11,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
diff --git a/sys/mips/conf/DB120 b/sys/mips/conf/DB120
index 79d0b01049e4..0924d25cbcb5 100644
--- a/sys/mips/conf/DB120
+++ b/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
diff --git a/sys/mips/conf/DIR-655A1 b/sys/mips/conf/DIR-655A1
index f5f9d6eabf24..22004f63b6d0 100644
--- a/sys/mips/conf/DIR-655A1
+++ b/sys/mips/conf/DIR-655A1
@@ -7,6 +7,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
diff --git a/sys/mips/conf/DIR-825B1 b/sys/mips/conf/DIR-825B1
index 49cf0de676ac..40dcbf5e50e2 100644
--- a/sys/mips/conf/DIR-825B1
+++ b/sys/mips/conf/DIR-825B1
@@ -13,6 +13,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"DIR-825B1"
 hints		"DIR-825B1.hints"
diff --git a/sys/mips/conf/DIR-825C1 b/sys/mips/conf/DIR-825C1
index c2b038e97b6f..2721962ef8c0 100644
--- a/sys/mips/conf/DIR-825C1
+++ b/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
diff --git a/sys/mips/conf/ENH200 b/sys/mips/conf/ENH200
index bb8869422d11..bece380d2a94 100644
--- a/sys/mips/conf/ENH200
+++ b/sys/mips/conf/ENH200
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"ENH200"
 hints		"ENH200.hints"
diff --git a/sys/mips/conf/ONIONOMEGA b/sys/mips/conf/ONIONOMEGA
index 94c8a3375e0b..8b3ec4662f19 100644
--- a/sys/mips/conf/ONIONOMEGA
+++ b/sys/mips/conf/ONIONOMEGA
@@ -11,6 +11,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
diff --git a/sys/mips/conf/PB47 b/sys/mips/conf/PB47
index 65e54fd34d20..8386365438c3 100644
--- a/sys/mips/conf/PB47
+++ b/sys/mips/conf/PB47
@@ -13,6 +13,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"PB47"
 hints		"PB47.hints"
diff --git a/sys/mips/conf/PICOSTATION_M2HP b/sys/mips/conf/PICOSTATION_M2HP
index da6228b7d9e2..3e738e6ca5f4 100644
--- a/sys/mips/conf/PICOSTATION_M2HP
+++ b/sys/mips/conf/PICOSTATION_M2HP
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"PICOSTATION_M2HP"
 hints		"PICOSTATION_M2HP.hints"
diff --git a/sys/mips/conf/ROUTERSTATION b/sys/mips/conf/ROUTERSTATION
index 6b46cf74246e..41adccd20659 100644
--- a/sys/mips/conf/ROUTERSTATION
+++ b/sys/mips/conf/ROUTERSTATION
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"ROUTERSTATION"
 hints		"ROUTERSTATION.hints"
diff --git a/sys/mips/conf/ROUTERSTATION_MFS b/sys/mips/conf/ROUTERSTATION_MFS
index 6c0f0f199d61..1c1ab491751f 100644
--- a/sys/mips/conf/ROUTERSTATION_MFS
+++ b/sys/mips/conf/ROUTERSTATION_MFS
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"ROUTERSTATION_MFS"
 hints		"ROUTERSTATION.hints"
diff --git a/sys/mips/conf/RSPRO b/sys/mips/conf/RSPRO
index 5936767bdbae..43d87b69b26f 100644
--- a/sys/mips/conf/RSPRO
+++ b/sys/mips/conf/RSPRO
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"RSPRO"
 hints		"RSPRO.hints"
diff --git a/sys/mips/conf/RSPRO_MFS b/sys/mips/conf/RSPRO_MFS
index f0c9b5b428ee..6cacd3dd6471 100644
--- a/sys/mips/conf/RSPRO_MFS
+++ b/sys/mips/conf/RSPRO_MFS
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"RSPRO_MFS"
 hints		"RSPRO.hints"
diff --git a/sys/mips/conf/TL-ARCHERC7V2 b/sys/mips/conf/TL-ARCHERC7V2
index bd1fe6d721ce..21f26a4de51b 100644
--- a/sys/mips/conf/TL-ARCHERC7V2
+++ b/sys/mips/conf/TL-ARCHERC7V2
@@ -12,6 +12,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
diff --git a/sys/mips/conf/TL-WDR4300 b/sys/mips/conf/TL-WDR4300
index e150c913436f..3c797441132f 100644
--- a/sys/mips/conf/TL-WDR4300
+++ b/sys/mips/conf/TL-WDR4300
@@ -4,6 +4,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR934x parameters
 include         "AR934X_BASE"
 
diff --git a/sys/mips/conf/TL-WR1043NDv2 b/sys/mips/conf/TL-WR1043NDv2
index 48fddf0bb735..2bcde0cd4c4f 100644
--- a/sys/mips/conf/TL-WR1043NDv2
+++ b/sys/mips/conf/TL-WR1043NDv2
@@ -7,6 +7,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
diff --git a/sys/mips/conf/TL-WR740Nv4 b/sys/mips/conf/TL-WR740Nv4
index 807e7c75a5e8..5257dd9b70e0 100644
--- a/sys/mips/conf/TL-WR740Nv4
+++ b/sys/mips/conf/TL-WR740Nv4
@@ -9,6 +9,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
diff --git a/sys/mips/conf/TP-MR3020 b/sys/mips/conf/TP-MR3020
index 7c0c5abc47e5..619fa02c1578 100644
--- a/sys/mips/conf/TP-MR3020
+++ b/sys/mips/conf/TP-MR3020
@@ -16,6 +16,8 @@
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include	"AR933X_BASE"
 
diff --git a/sys/mips/conf/TP-WN1043ND b/sys/mips/conf/TP-WN1043ND
index ed3309c681dc..c5832a2151b0 100644
--- a/sys/mips/conf/TP-WN1043ND
+++ b/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"
 
diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP
index c8280cc7d89a..90c5dc652f5b 100644
--- a/sys/mips/conf/WZR-300HP
+++ b/sys/mips/conf/WZR-300HP
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"WZR-300HP"
 hints		"WZR-300HP.hints"
diff --git a/sys/mips/conf/WZR-HPAG300H b/sys/mips/conf/WZR-HPAG300H
index 21e9bccfa469..7d01b6d19714 100644
--- a/sys/mips/conf/WZR-HPAG300H
+++ b/sys/mips/conf/WZR-HPAG300H
@@ -12,6 +12,8 @@
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"WZR-HPAG300H"
 hints		"WZR-HPAG300H.hints"