[src/trunk]: src/sys/arch/sandpoint/conf Disable CFI in the GENERIC kernel ag...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1b3762641f5f
branches:  trunk
changeset: 810921:1b3762641f5f
user:      phx <phx%NetBSD.org@localhost>
date:      Wed Sep 30 14:22:02 2015 +0000

description:
Disable CFI in the GENERIC kernel again, as currently only cmdset 1.3
is supported, which is not present in all flash chips.
Add lmtemp(4), an LM75 temperature sensor, which is found in some
Synology NAS models.

diffstat:

 sys/arch/sandpoint/conf/GENERIC |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r a55485825bc3 -r 1b3762641f5f sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC   Wed Sep 30 14:18:54 2015 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC   Wed Sep 30 14:22:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.90 2015/09/21 23:31:41 phx Exp $
+# $NetBSD: GENERIC,v 1.91 2015/09/30 14:22:02 phx Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.90 $"
+#ident                 "GENERIC-$Revision: 1.91 $"
 
 maxusers       32
 
@@ -173,9 +173,9 @@
 mainbus0       at root
 cpu*           at mainbus0
 
-cfi0           at mainbus0
-nor*           at cfi?
-flash*         at nor?
+#cfi0          at mainbus0
+#nor*          at cfi?
+#flash*                at nor?
 
 nhpow0         at mainbus0                     # NH230/231 power,LED,buttons
 
@@ -189,6 +189,7 @@
 satmgr0        at eumb? unit 1                 # satmgr at 0x4600
 ociic*         at eumb?
 iic*           at ociic?
+lmtemp*                at iic? addr 0x48               # LM75 temperature sensor
 rs5c372rtc*    at iic? addr 0x32
 s390rtc*       at iic? addr 0x30
 pcf8563rtc*    at iic? addr 0x51