diff options
| author | brooks <brooks@FreeBSD.org> | 2013-11-01 20:33:30 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-11-01 20:33:30 +0000 |
| commit | 0375b5a0cf32c64b36575562a323ac987f5ad82f (patch) | |
| tree | 10e21ebbeb7fccd6b504cd7844b1c6995565d720 /sys | |
| parent | abc4d8de522229bd713dfb557bb5c700418cf06c (diff) | |
| download | FreeBSD-src-0375b5a0cf32c64b36575562a323ac987f5ad82f.zip FreeBSD-src-0375b5a0cf32c64b36575562a323ac987f5ad82f.tar.gz | |
MFC r256753
MFP4: 1136252
Add an option ATSE_CFI_HACK to allow memory mapped CFI devices to have
their address range allocated sharable so that atse(4) can find it's
Ethernet address in the expected location.
We intend to remove this hack once the BERI platform has a loader.
Sponsored by: DARPA/AFRL
Approved by: re (gjb)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/dev/cfi/cfi_core.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/conf/options b/sys/conf/options index 1009f5b..a4c785e 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -69,6 +69,7 @@ TEXTDUMP_VERBOSE opt_ddb.h 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 diff --git a/sys/dev/cfi/cfi_core.c b/sys/dev/cfi/cfi_core.c index f318ebc..3393ca6 100644 --- a/sys/dev/cfi/cfi_core.c +++ b/sys/dev/cfi/cfi_core.c @@ -281,7 +281,11 @@ cfi_attach(device_t dev) 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); |
