summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arm/conf/AVILA2
-rw-r--r--sys/arm/conf/BWCT2
-rw-r--r--sys/arm/conf/CRB2
-rw-r--r--sys/arm/conf/DB-78XXX2
-rw-r--r--sys/arm/conf/DB-88F5XXX2
-rw-r--r--sys/arm/conf/DB-88F6XXX2
-rw-r--r--sys/arm/conf/DEFAULTS11
-rw-r--r--sys/arm/conf/EP802192
-rw-r--r--sys/arm/conf/GUMSTIX2
-rw-r--r--sys/arm/conf/HL2002
-rw-r--r--sys/arm/conf/IQ312442
-rw-r--r--sys/arm/conf/KB920X2
-rw-r--r--sys/arm/conf/NSLU2
-rw-r--r--sys/arm/conf/SIMICS2
-rw-r--r--sys/arm/conf/SKYEYE2
-rw-r--r--sys/conf/files.arm8
16 files changed, 15 insertions, 32 deletions
diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index e2569fe..303e1d6 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine arm
ident AVILA
options PHYSADDR=0x10000000
@@ -80,7 +79,6 @@ options BOOTP_COMPAT
#options PREEMPTION
#options VERBOSE_SYSINIT
-device mem # Memory and kernel memory devices
#device saarm
device pci
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index e3e220e..1c18f7b 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -17,7 +17,6 @@
#
# $FreeBSD$
-machine arm
ident BWCT
options VERBOSE_INIT_ARM
@@ -85,7 +84,6 @@ device rlswitch
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
#options DIAGNOSTIC
-device mem # Memory and kernel memory devices
device md
device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index c70469b..549a8b2 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -17,7 +17,6 @@
#
# $FreeBSD$
-machine arm
ident CRB
options PHYSADDR=0x00000000
@@ -67,7 +66,6 @@ options BOOTP_COMPAT
#options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
#device saarm
device miibus
device rl
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 6d8d268..dabb153 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -4,7 +4,6 @@
# $FreeBSD$
#
-machine arm
ident DB-88F78XX
include "../mv/discovery/std.db78xxx"
@@ -49,7 +48,6 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
# Pseudo devices
device loop
-device mem
device md
device pty
device random
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 1abde68..66b286b 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -4,7 +4,6 @@
# $FreeBSD$
#
-machine arm
ident DB-88F5XXX
include "../mv/orion/std.db88f5xxx"
@@ -48,7 +47,6 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
#options WITNESS_KDB
# Pseudo devices
-device mem
device md
device loop
device pty
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index 11efc27..332f0e1 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -4,7 +4,6 @@
# $FreeBSD$
#
-machine arm
ident DB-88F6XXX
include "../mv/kirkwood/std.db88f6xxx"
@@ -49,7 +48,6 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
# Pseudo devices
device loop
-device mem
device md
device pty
device random
diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS
new file mode 100644
index 0000000..606e962
--- /dev/null
+++ b/sys/arm/conf/DEFAULTS
@@ -0,0 +1,11 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/arm
+#
+# $FreeBSD$
+
+machine arm
+
+device mem
+
+options GEOM_BSD
+options GEOM_MBR
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index a31d61b..8e2d6cb 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -17,7 +17,6 @@
#
# $FreeBSD$
-machine arm
ident EP80219
options PHYSADDR=0xa0000000
@@ -69,7 +68,6 @@ options BOOTP_COMPAT
#options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
#device saarm
device miibus
device fxp
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
index dee63df..26bf30e 100644
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine arm
ident GUMSTIX
cpu CPU_XSCALE_PXA2X0
@@ -71,7 +70,6 @@ options BOOTP_BLOCKSIZE=4096
options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
device mii
device smc
device smcphy
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index fff2cbd..b07f9cf 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine arm
ident HL200
include "../at91/std.at91"
@@ -89,7 +88,6 @@ device lxtphy
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device mem # Memory and kernel memory devices
device md
device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index 1a2ccb7..411b97d 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -17,7 +17,6 @@
#
# $FreeBSD$
-machine arm
ident IQ31244
options PHYSADDR=0xa0000000
@@ -66,7 +65,6 @@ options BOOTP_COMPAT
#options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
#device saarm
device miibus
device rl
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index a517441..255714c 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine arm
ident KB920X
include "../at91/std.kb920x"
@@ -80,7 +79,6 @@ device lxtphy
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device mem # Memory and kernel memory devices
device md
device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index 9b4d2ff..87edba4 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -17,7 +17,6 @@
#
# $FreeBSD$
-machine arm
ident NSLU
options PHYSADDR=0x10000000
@@ -76,7 +75,6 @@ options BOOTP_NFSV3
options BOOTP_WIRED_TO=npe0
options BOOTP_COMPAT
-device mem # Memory and kernel memory devices
device pci
device uart
diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS
index 4d54e7a..f74b1e3 100644
--- a/sys/arm/conf/SIMICS
+++ b/sys/arm/conf/SIMICS
@@ -17,7 +17,6 @@
#
# $FreeBSD$
-machine arm
ident SIMICS
options KERNPHYSADDR=0xc0000000
@@ -68,5 +67,4 @@ device uart
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device mem # Memory and kernel memory devices
device md
diff --git a/sys/arm/conf/SKYEYE b/sys/arm/conf/SKYEYE
index e3c9646..e394d30 100644
--- a/sys/arm/conf/SKYEYE
+++ b/sys/arm/conf/SKYEYE
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine arm
ident KB920X
options KERNPHYSADDR=0xc0000000
@@ -79,7 +78,6 @@ device uart
#options SMP # Symmetric MultiProcessor Kernel
#options APIC_IO # Symmetric (APIC) I/O
-device mem # Memory and kernel memory devices
device md
options SKYEYE_WORKAROUNDS
# Floppy drives
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 3cb7a5c..621317b 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -46,10 +46,10 @@ arm/arm/vm_machdep.c standard
arm/fpe-arm/armfpe_glue.S optional armfpe
arm/fpe-arm/armfpe_init.c optional armfpe
arm/fpe-arm/armfpe.S optional armfpe
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
+geom/geom_bsd.c optional geom_bsd
+geom/geom_bsd_enc.c optional geom_bsd
+geom/geom_mbr.c optional geom_mbr
+geom/geom_mbr_enc.c optional geom_mbr
hal.o optional ath_hal \
compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \
no-implicit-rule
OpenPOWER on IntegriCloud