summaryrefslogtreecommitdiffstats
path: root/sys/arm
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2013-07-31 17:21:18 +0000
committerobrien <obrien@FreeBSD.org>2013-07-31 17:21:18 +0000
commit7999076e3e464a2dd3a7abc86d14b874da837ec0 (patch)
tree0214e6338a2fb9904fb96b90f6c2f84d17e742a0 /sys/arm
parenta8df631d0527c68753a33443af52e11b08ebde5d (diff)
downloadFreeBSD-src-7999076e3e464a2dd3a7abc86d14b874da837ec0.zip
FreeBSD-src-7999076e3e464a2dd3a7abc86d14b874da837ec0.tar.gz
Back out r253779 & r253786.
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/conf/AC1001
-rw-r--r--sys/arm/conf/ARMADAXP1
-rw-r--r--sys/arm/conf/ARNDALE1
-rw-r--r--sys/arm/conf/ATMEL1
-rw-r--r--sys/arm/conf/AVILA1
-rw-r--r--sys/arm/conf/BEAGLEBONE1
-rw-r--r--sys/arm/conf/BWCT1
-rw-r--r--sys/arm/conf/CAMBRIA1
-rw-r--r--sys/arm/conf/CNS11XXNAS1
-rw-r--r--sys/arm/conf/CRB1
-rw-r--r--sys/arm/conf/CUBIEBOARD2
-rw-r--r--sys/arm/conf/DB-78XXX1
-rw-r--r--sys/arm/conf/DB-88F5XXX1
-rw-r--r--sys/arm/conf/DB-88F6XXX1
-rw-r--r--sys/arm/conf/DOCKSTAR1
-rw-r--r--sys/arm/conf/DREAMPLUG-10011
-rw-r--r--sys/arm/conf/EA32501
-rw-r--r--sys/arm/conf/EB92001
-rw-r--r--sys/arm/conf/EFIKA_MX1
-rw-r--r--sys/arm/conf/EP802191
-rw-r--r--sys/arm/conf/ETHERNUT51
-rw-r--r--sys/arm/conf/GUMSTIX1
-rw-r--r--sys/arm/conf/HL2001
-rw-r--r--sys/arm/conf/HL2012
-rw-r--r--sys/arm/conf/IQ312441
-rw-r--r--sys/arm/conf/KB920X1
-rw-r--r--sys/arm/conf/LN2410SBC2
-rw-r--r--sys/arm/conf/NSLU1
-rw-r--r--sys/arm/conf/PANDABOARD1
-rw-r--r--sys/arm/conf/QILA9G201
-rw-r--r--sys/arm/conf/RPI-B1
-rw-r--r--sys/arm/conf/SAM9260EK1
-rw-r--r--sys/arm/conf/SAM9G20EK1
-rw-r--r--sys/arm/conf/SAM9X25EK2
-rw-r--r--sys/arm/conf/SHEEVAPLUG1
-rw-r--r--sys/arm/conf/SN9G451
-rw-r--r--sys/arm/conf/TS78001
-rw-r--r--sys/arm/conf/VERSATILEPB1
-rw-r--r--sys/arm/conf/ZEDBOARD1
39 files changed, 4 insertions, 39 deletions
diff --git a/sys/arm/conf/AC100 b/sys/arm/conf/AC100
index a3c6826..d368bdf 100644
--- a/sys/arm/conf/AC100
+++ b/sys/arm/conf/AC100
@@ -61,7 +61,6 @@ options MUTEX_DEBUG
# Pseudo devices
device random
-options YARROW_RNG # Yarrow software RNG
device pty
device loop
device md
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index f7be570..54aa635 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -61,7 +61,6 @@ options KDB_TRACE
# Pseudo devices
device random
-options YARROW_RNG # Yarrow software RNG
device pty
device loop
device md
diff --git a/sys/arm/conf/ARNDALE b/sys/arm/conf/ARNDALE
index 3bd8a2f..1864f33 100644
--- a/sys/arm/conf/ARNDALE
+++ b/sys/arm/conf/ARNDALE
@@ -88,7 +88,6 @@ options ROOTDEVNAME=\"ufs:/dev/da0\"
device loop
device random
-options YARROW_RNG # Yarrow software RNG
device pty
device md
device gpio
diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL
index 6aa6a3e..eb3dd7d 100644
--- a/sys/arm/conf/ATMEL
+++ b/sys/arm/conf/ATMEL
@@ -134,7 +134,6 @@ device geom_map # GEOM partition mapping
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index 9397f39..4246462 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -107,7 +107,6 @@ device if_bridge
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
# Wireless NIC cards
device wlan # 802.11 support
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index b8f54c7..997a62f 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -90,7 +90,6 @@ device pty
device snp
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
# I2C support
device iicbus
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index 9df78e4..4c6a1f1 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -68,7 +68,6 @@ options NO_FFS_SNAPSHOT
options NO_SWAPPING
device loop
device random
-options YARROW_RNG # Yarrow software RNG
device ether
device vlan
device uart
diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA
index 43fde27..377f45d 100644
--- a/sys/arm/conf/CAMBRIA
+++ b/sys/arm/conf/CAMBRIA
@@ -110,7 +110,6 @@ device if_bridge
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
# Wireless NIC cards
device wlan # 802.11 support
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
index cb4c210..e66e2bb 100644
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@@ -102,7 +102,6 @@ device loop
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
#options ARM_USE_SMALL_ALLOC
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index 25ed432..d9b0a4e 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -105,7 +105,6 @@ options DDB #Enable the kernel debugger
options XSCALE_CACHE_READ_WRITE_ALLOCATE
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
device iopwdog
options ARM_USE_SMALL_ALLOC
diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD
index f514244..179b383 100644
--- a/sys/arm/conf/CUBIEBOARD
+++ b/sys/arm/conf/CUBIEBOARD
@@ -92,7 +92,6 @@ device pty
device snp
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
# I2C support
#device iicbus
@@ -131,3 +130,4 @@ device miibus
options FDT
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=cubieboard.dts
+
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index afe71af..f3e62f5 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -55,7 +55,6 @@ device pci
device loop
device md
device random
-options YARROW_RNG # Yarrow software RNG
# Serial ports
device uart
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index f113e30..50ca24e 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -54,7 +54,6 @@ device pci
device md
device loop
device random
-options YARROW_RNG # Yarrow software RNG
# Serial ports
device uart
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index f32aa59..cf508ad 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -55,7 +55,6 @@ device pci
device loop
device md
device random
-options YARROW_RNG # Yarrow software RNG
# Serial ports
device uart
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index 5142b84..25c0121 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -46,7 +46,6 @@ options KDB
# Pseudo devices
device md
device random
-options YARROW_RNG # Yarrow software RNG
device loop
# Serial ports
diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001
index b39b636..442cde0 100644
--- a/sys/arm/conf/DREAMPLUG-1001
+++ b/sys/arm/conf/DREAMPLUG-1001
@@ -62,7 +62,6 @@ device loop #Network loopback
device md #Memory/malloc disk
device pty #BSD-style compatibility pseudo ttys
device random #Entropy device
-options YARROW_RNG # Yarrow software RNG
device tun #Packet tunnel.
device ether #Required for all ethernet devices
device vlan #802.1Q VLAN support
diff --git a/sys/arm/conf/EA3250 b/sys/arm/conf/EA3250
index 6fb0dfe..89d9fa4 100644
--- a/sys/arm/conf/EA3250
+++ b/sys/arm/conf/EA3250
@@ -54,7 +54,6 @@ device loop
device md
device pty
device random
-options YARROW_RNG # Yarrow software RNG
# Serial ports
device uart
diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200
index b3ebc61..0570699 100644
--- a/sys/arm/conf/EB9200
+++ b/sys/arm/conf/EB9200
@@ -60,7 +60,6 @@ options SX_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device ether
device uart
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index 07c0630..71edb8c 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -96,7 +96,6 @@ device bpf # Berkeley packet filter
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
device ether # Ethernet support
#device vlan # 802.1Q VLAN support
#device tun # Packet tunnel.
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index 1d6b87d..a112fe1 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -101,7 +101,6 @@ options DDB #Enable the kernel debugger
options XSCALE_CACHE_READ_WRITE_ALLOCATE
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
options ARM_USE_SMALL_ALLOC
# Floppy drives
diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5
index 8a68249..ef52bc6 100644
--- a/sys/arm/conf/ETHERNUT5
+++ b/sys/arm/conf/ETHERNUT5
@@ -126,7 +126,6 @@ device geom_map # GEOM partition mapping
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
device ether # Ethernet support
#device vlan # 802.1Q VLAN support
#device tun # Packet tunnel.
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
index b752daa..11fe6a9 100644
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@@ -88,4 +88,3 @@ options DDB #Enable the kernel debugger
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index fb980ef..415cbc9 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -65,7 +65,6 @@ options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device ether
device uart
diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
index a2eee41..1294f1a 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -67,7 +67,6 @@ options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device ether
device uart
@@ -130,3 +129,4 @@ device pass # Passthrough device (direct SCSI access)
#device wlan_tkip # 802.11 TKIP support
#device wlan_amrr # AMRR transmit rate control algorithm
options ROOTDEVNAME=\"ufs:da0s1a\"
+
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index 91fbe22..1eb4a20 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -106,7 +106,6 @@ options DDB #Enable the kernel debugger
options XSCALE_CACHE_READ_WRITE_ALLOCATE
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
options ARM_USE_SMALL_ALLOC
# Floppy drives
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index e8639b4..7cf56d8 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -66,7 +66,6 @@ options SX_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device ether
device uart
diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
index e7ccc6e..8d2a585 100644
--- a/sys/arm/conf/LN2410SBC
+++ b/sys/arm/conf/LN2410SBC
@@ -62,7 +62,6 @@ options SX_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device ether
@@ -84,3 +83,4 @@ device ohci
device umass
device scbus # SCSI bus (required for da)
device da # Direct Access (disks)
+
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index 43eee38..0980e4d 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -105,7 +105,6 @@ device loop
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
#options ARM_USE_SMALL_ALLOC
diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index ae3b965..788a0ed 100644
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@@ -110,7 +110,6 @@ device md
#options MD_ROOT_SIZE=7560
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
# USB support
device usb
diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
index d0c5793..50d9a37 100644
--- a/sys/arm/conf/QILA9G20
+++ b/sys/arm/conf/QILA9G20
@@ -77,7 +77,6 @@ options NO_SWAPPING
#options DIAGNOSTIC
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device bpf
device ether
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index f8d53f3..251bf55 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -86,7 +86,6 @@ options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
# USB support
device usb
diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK
index d48bb55..08b308d 100644
--- a/sys/arm/conf/SAM9260EK
+++ b/sys/arm/conf/SAM9260EK
@@ -134,7 +134,6 @@ device mmcsd # MMC/SD memory card
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
device ether # Ethernet support
#device vlan # 802.1Q VLAN support
#device tun # Packet tunnel.
diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
index dce47b6..e173f01 100644
--- a/sys/arm/conf/SAM9G20EK
+++ b/sys/arm/conf/SAM9G20EK
@@ -76,7 +76,6 @@ options NO_SWAPPING
#options DIAGNOSTIC
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device bpf
device ether
diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK
index 80337a8..6cdeac6 100644
--- a/sys/arm/conf/SAM9X25EK
+++ b/sys/arm/conf/SAM9X25EK
@@ -77,7 +77,6 @@ options NO_SWAPPING
#options DIAGNOSTIC
device random
-options YARROW_RNG # Yarrow software RNG
device pty
device loop
device bpf
@@ -151,3 +150,4 @@ device miibus
#device wlan_ccmp # 802.11 CCMP support
#device wlan_tkip # 802.11 TKIP support
#device wlan_amrr # AMRR transmit rate control algorithm
+
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index 12634cc..c6bd901 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -45,7 +45,6 @@ options KDB
# Pseudo devices
device random
-options YARROW_RNG # Yarrow software RNG
device loop
# Serial ports
diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45
index c826723..123136b 100644
--- a/sys/arm/conf/SN9G45
+++ b/sys/arm/conf/SN9G45
@@ -76,7 +76,6 @@ options NO_SWAPPING
#options DIAGNOSTIC
device random
-options YARROW_RNG # Yarrow software RNG
device loop
device bpf
device ether
diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800
index dd97791..79e9dba 100644
--- a/sys/arm/conf/TS7800
+++ b/sys/arm/conf/TS7800
@@ -48,7 +48,6 @@ device pci
device md
device loop
device random
-options YARROW_RNG # Yarrow software RNG
# Serial ports
device uart
diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB
index f81653a..b12009dc0 100644
--- a/sys/arm/conf/VERSATILEPB
+++ b/sys/arm/conf/VERSATILEPB
@@ -94,7 +94,6 @@ options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required
device md
device random # Entropy device
-options YARROW_RNG # Yarrow software RNG
# Flattened Device Tree
options FDT
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index 2944220..1008125 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -66,7 +66,6 @@ options KDB
device loop
device random
-options YARROW_RNG # Yarrow software RNG
device ether
device if_cgem # Zynq-7000 gig ethernet device
device mii
OpenPOWER on IntegriCloud