Module Name:    src
Committed By:   phx
Date:           Wed Sep 30 14:22:02 UTC 2015

Modified Files:
        src/sys/arch/sandpoint/conf: GENERIC

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/sandpoint/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.90 src/sys/arch/sandpoint/conf/GENERIC:1.91
--- src/sys/arch/sandpoint/conf/GENERIC:1.90	Mon Sep 21 23:31:41 2015
+++ src/sys/arch/sandpoint/conf/GENERIC	Wed Sep 30 14:22:02 2015
@@ -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 @@ include 	"arch/sandpoint/conf/std.sandpo
 
 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 @@ config		netbsd	root on ? type ?
 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 @@ com0		at eumb? unit 0			# console at 0x4
 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

Reply via email to