PERFORCE change 222078 for review

[Brooks Davis]

http://p4web.freebsd.org/@@222078?ac=10

Change 222078 by brooks at brooks_zenith on 2013/02/15 20:07:03

	Switch to cfi(4) in the default de4 kernel.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#15 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#4 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#15 (text+ko) ====

@@ -99,14 +99,9 @@
 		 * XXX-BZ keep flash before ethernet so that atse can read the
 		 * Ethernet addresses for now.
 		 */
-		flash at 0x74000000 {
-			compatible = "intel,strataflash";
-			reg = <0x74000000 0x2000000>;
-		};
-
-		flash at 0x76000000 {
-			compatible = "intel,strataflash";
-			reg = <0x76000000 0x2000000>;
+		flash at 74000000 {
+			compatible = "cfi-flash";
+			reg = <0x74000000 0x4000000>;
 		};
 
 		ethernet at 7f007000 {

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#4 (text+ko) ====

@@ -11,6 +11,10 @@
 
 ident		BERI_DE4_BASE
 
+options 	NFSCL			# New Network Filesystem Client
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
+
 options         FDT
 options         FDT_DTB_STATIC
 makeoptions     FDT_DTS_FILE=beripad-de4.dts
@@ -25,7 +29,7 @@
 device		terasic_mtl
 
 device		bpf
-device		isf
+device		cfi
 device		sc
 
 device		miibus