PERFORCE change 1136252 for review

[Brooks Davis]

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

Change 1136252 by brooks at brooks_zenith on 2013/10/18 18:41:00

	Add a new option ATSE_CFI_HACK to cause cfi(4) devices to be
	mapped shared so atse(4) can read from them.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/conf/options#12 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#21 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#7 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/conf/options#12 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/options 256377 2013-10-12 12:57:57Z markm $
+# $FreeBSD: head/sys/conf/options 256744 2013-10-18 15:27:11Z brooks $
 #
 #        On the handling of kernel options
 #
@@ -69,6 +69,7 @@
 ADAPTIVE_LOCKMGRS
 ALQ
 ALTERA_SDCARD_FAST_SIM	opt_altera_sdcard.h
+ATSE_CFI_HACK	opt_cfi.h
 AUDIT		opt_global.h
 BOOTHOWTO	opt_global.h
 BOOTVERBOSE	opt_global.h

==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#21 (text+ko) ====

@@ -281,7 +281,11 @@
 
 	sc->sc_rid = 0;
 	sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_rid,
+#ifndef ATSE_CFI_HACK
+	    RF_ACTIVE);
+#else
 	    RF_ACTIVE | RF_SHAREABLE);
+#endif
 	if (sc->sc_res == NULL)
 		return (ENXIO);
 

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

@@ -32,6 +32,7 @@
 device		cfi
 device		cfid
 options 	CFI_SUPPORT_STRATAFLASH
+options 	ATSE_CFI_HACK
 device		sc
 
 device		uart