Date: Fri, 1 Nov 2013 20:33:30 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r257524 - in stable/10/sys: conf dev/cfi Message-ID: <201311012033.rA1KXU4C041492@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Nov 1 20:33:30 2013 New Revision: 257524 URL: http://svnweb.freebsd.org/changeset/base/257524 Log: 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) Modified: stable/10/sys/conf/options stable/10/sys/dev/cfi/cfi_core.c Directory Properties: stable/10/sys/ (props changed) stable/10/sys/conf/ (props changed) Modified: stable/10/sys/conf/options ============================================================================== --- stable/10/sys/conf/options Fri Nov 1 20:30:19 2013 (r257523) +++ stable/10/sys/conf/options Fri Nov 1 20:33:30 2013 (r257524) @@ -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 Modified: stable/10/sys/dev/cfi/cfi_core.c ============================================================================== --- stable/10/sys/dev/cfi/cfi_core.c Fri Nov 1 20:30:19 2013 (r257523) +++ stable/10/sys/dev/cfi/cfi_core.c Fri Nov 1 20:33:30 2013 (r257524) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311012033.rA1KXU4C041492>