summaryrefslogtreecommitdiff
path: root/sys/arch/arm32
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/arm32')
-rw-r--r--sys/arch/arm32/conf/GENERIC4
-rw-r--r--sys/arch/arm32/conf/GENERIC.v67
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/arm32/conf/GENERIC b/sys/arch/arm32/conf/GENERIC
index 8088e7bf130..3103d84dae6 100644
--- a/sys/arch/arm32/conf/GENERIC
+++ b/sys/arch/arm32/conf/GENERIC
@@ -192,6 +192,10 @@ pseudo-device ccd 2 # concatenated disk devices
pseudo-device rd 1 # Ramdisk driver
+# for IPv6
+pseudo-device gif 4
+#pseudo-device faith 1
+
makeoptions MONITOR="Taxan875+LR"
#makeoptions MONITOR="AKF60"
makeoptions MODES="1024,768,60 1024,768,70 800,600,60 640,480,60 1280,1024 1152,900"
diff --git a/sys/arch/arm32/conf/GENERIC.v6 b/sys/arch/arm32/conf/GENERIC.v6
deleted file mode 100644
index 0bcd4e83e91..00000000000
--- a/sys/arch/arm32/conf/GENERIC.v6
+++ /dev/null
@@ -1,7 +0,0 @@
-include "arch/arm32/conf/GENERIC"
-
-options INET6 # IPV6
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1