diff options
author | jhb <jhb@FreeBSD.org> | 2005-11-21 20:17:46 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2005-11-21 20:17:46 +0000 |
commit | 23a1490fe0d92113b63777d239427f7107d9700e (patch) | |
tree | 5fa148ccf4fa403950461b7e8a7fe93b2c584856 | |
parent | bef2e3c846f9290b3e3d31c3c5e4c2bf13b22e2b (diff) | |
download | FreeBSD-src-23a1490fe0d92113b63777d239427f7107d9700e.zip FreeBSD-src-23a1490fe0d92113b63777d239427f7107d9700e.tar.gz |
Create DEFAULTS files for alpha, ia64, powerpc, and sparc64 and move
'device mem' over from GENERIC to DEFAULTS to be consistent with i386 and
amd64. Additionally, on ia64 enable ACPI by default since ia64 requires
acpi.
-rw-r--r-- | sys/alpha/conf/DEFAULTS | 10 | ||||
-rw-r--r-- | sys/alpha/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/ia64/conf/DEFAULTS | 13 | ||||
-rw-r--r-- | sys/ia64/conf/GENERIC | 2 | ||||
-rw-r--r-- | sys/powerpc/conf/DEFAULTS | 10 | ||||
-rw-r--r-- | sys/powerpc/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/sparc64/conf/DEFAULTS | 10 | ||||
-rw-r--r-- | sys/sparc64/conf/GENERIC | 1 |
8 files changed, 43 insertions, 5 deletions
diff --git a/sys/alpha/conf/DEFAULTS b/sys/alpha/conf/DEFAULTS new file mode 100644 index 0000000..c199be2 --- /dev/null +++ b/sys/alpha/conf/DEFAULTS @@ -0,0 +1,10 @@ +# +# DEFAULTS -- Default kernel configuration file for FreeBSD/alpha +# +# $FreeBSD$ + +# Not yet, this would break all existing configs +#machine alpha + +# Pseudo devices. +device mem # Memory and kernel memory devices diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 2be16f3..cab4e45 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -183,7 +183,6 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices device random # Entropy device device ether # Ethernet support device sl # Kernel SLIP diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS new file mode 100644 index 0000000..331061d --- /dev/null +++ b/sys/ia64/conf/DEFAULTS @@ -0,0 +1,13 @@ +# +# DEFAULTS -- Default kernel configuration file for FreeBSD/ia64 +# +# $FreeBSD$ + +# Not yet, this would break all existing configs +#machine ia64 + +# Bus support. +device acpi # ACPI support + +# Pseudo devices. +device mem # Memory and kernel memory devices diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 560e92d..2e457ab 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -56,7 +56,6 @@ options UFS_DIRHASH # Hash-based directory lookup scheme options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions # Various "busses" -device acpi # ACPI support (mandatory) device firewire # FireWire bus code device miibus # MII bus support (Ethernet) device pci # PCI bus support @@ -141,7 +140,6 @@ device faith # IPv6-to-IPv4 relaying (translation) device gif # IPv6 and IPv4 tunneling device loop # Network loopback device md # Memory "disks" -device mem # Memory and kernel memory devices device pty # Pseudo-ttys (telnet etc) device puc # Multi I/O cards and multi-channel UARTs device random # Entropy device diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS new file mode 100644 index 0000000..bd4ddb8 --- /dev/null +++ b/sys/powerpc/conf/DEFAULTS @@ -0,0 +1,10 @@ +# +# DEFAULTS -- Default kernel configuration file for FreeBSD/powerpc +# +# $FreeBSD$ + +# Not yet, this would break all existing configs +#machine powerpc + +# Pseudo devices. +device mem # Memory and kernel memory devices diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 53ca3df..3dfd5db 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -104,7 +104,6 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices device random # Entropy device device ether # Ethernet support device sl # Kernel SLIP diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS new file mode 100644 index 0000000..087ee1d --- /dev/null +++ b/sys/sparc64/conf/DEFAULTS @@ -0,0 +1,10 @@ +# +# DEFAULTS -- Default kernel configuration file for FreeBSD/sparc64 +# +# $FreeBSD$ + +# Not yet, this would break all existing configs +#machine sparc64 + +# Pseudo devices. +device mem # Memory and kernel memory devices diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 73a13c1..84968dd 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -186,7 +186,6 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices device random # Entropy device device ether # Ethernet support device sl # Kernel SLIP |