summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2007-10-29 22:19:08 +0000
committerpeter <peter@FreeBSD.org>2007-10-29 22:19:08 +0000
commite93fa6ca815f93c8749ef9edf5a974a4ec9563c0 (patch)
treeaa8b766651f616871f438dd347d1316c32b4a61b /sys
parentda852afdbd7b15bb6bd7271b9693309e888550e9 (diff)
downloadFreeBSD-src-e93fa6ca815f93c8749ef9edf5a974a4ec9563c0.zip
FreeBSD-src-e93fa6ca815f93c8749ef9edf5a974a4ec9563c0.tar.gz
Move nvram out of DEFAULTS. There really isn't a lot of justification
for consuming the memory. The module works just fine in the unlikely case that this is needed. It can still be compiled into a custom kernel.
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/conf/DEFAULTS1
-rw-r--r--sys/amd64/conf/NOTES3
-rw-r--r--sys/i386/conf/DEFAULTS1
-rw-r--r--sys/i386/conf/NOTES3
4 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index 519198c..e98b169 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -11,7 +11,6 @@ device isa
# Pseudo devices.
device mem # Memory and kernel memory devices
device io # I/O device
-device nvram # Access to rtc cmos via /dev/nvram
# UART chips on this platform
device uart_ns8250
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index f0208d9..207fa07 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -97,6 +97,9 @@ options CLK_CALIBRATION_LOOP
# clock to actually be used.
options CLK_USE_I8254_CALIBRATION
+# Provide read/write access to the memory in the clock chip.
+device nvram # Access to rtc cmos via /dev/nvram
+
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index 2e459f0..a5f69a1 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -15,7 +15,6 @@ device npx
# Pseudo devices.
device mem # Memory and kernel memory devices
device io # I/O device
-device nvram # Access to rtc cmos via /dev/nvram
# UART chips on this platform
device uart_ns8250
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 10c99f3..f73add9 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -268,6 +268,9 @@ options CLK_CALIBRATION_LOOP
# clock to actually be used.
options CLK_USE_I8254_CALIBRATION
+# Provide read/write access to the memory in the clock chip.
+device nvram # Access to rtc cmos via /dev/nvram
+
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
OpenPOWER on IntegriCloud