Date: Thu, 31 Oct 2013 16:16:53 +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: r257456 - in stable/10: share/man/man4 sys/conf sys/dev/isf sys/mips/conf usr.sbin usr.sbin/isfctl Message-ID: <201310311616.r9VGGrmm060666@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Oct 31 16:16:52 2013 New Revision: 257456 URL: http://svnweb.freebsd.org/changeset/base/257456 Log: MFC r256865 Remove the isf(4) driver. It was created by accident and is subset of the cfi(4) driver. It remained in the tree longer than would be ideal due to the time required to bring cfi(4) to feature parity. Sponsored by: DARPA/AFRL Approved by: re (gjb) Deleted: stable/10/share/man/man4/isf.4 stable/10/sys/dev/isf/ stable/10/usr.sbin/isfctl/ Modified: stable/10/share/man/man4/Makefile stable/10/sys/conf/files stable/10/sys/mips/conf/BERI_DE4.hints stable/10/sys/mips/conf/BERI_DE4_MDROOT stable/10/sys/mips/conf/BERI_DE4_SDROOT stable/10/usr.sbin/Makefile Directory Properties: stable/10/share/man/man4/ (props changed) stable/10/sys/ (props changed) stable/10/sys/conf/ (props changed) stable/10/usr.sbin/ (props changed) Modified: stable/10/share/man/man4/Makefile ============================================================================== --- stable/10/share/man/man4/Makefile Thu Oct 31 15:46:10 2013 (r257455) +++ stable/10/share/man/man4/Makefile Thu Oct 31 16:16:52 2013 (r257456) @@ -195,7 +195,6 @@ MAN= aac.4 \ ipwfw.4 \ isci.4 \ iscsi_initiator.4 \ - isf.4 \ isp.4 \ ispfw.4 \ iwi.4 \ Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Thu Oct 31 15:46:10 2013 (r257455) +++ stable/10/sys/conf/files Thu Oct 31 16:16:52 2013 (r257456) @@ -1539,9 +1539,6 @@ dev/iscsi_initiator/isc_cam.c optional i dev/iscsi_initiator/isc_soc.c optional iscsi_initiator scbus dev/iscsi_initiator/isc_sm.c optional iscsi_initiator scbus dev/iscsi_initiator/isc_subr.c optional iscsi_initiator scbus -dev/isf/isf.c optional isf -dev/isf/isf_fdt.c optional isf fdt -dev/isf/isf_nexus.c optional isf dev/isp/isp.c optional isp dev/isp/isp_freebsd.c optional isp dev/isp/isp_library.c optional isp Modified: stable/10/sys/mips/conf/BERI_DE4.hints ============================================================================== --- stable/10/sys/mips/conf/BERI_DE4.hints Thu Oct 31 15:46:10 2013 (r257455) +++ stable/10/sys/mips/conf/BERI_DE4.hints Thu Oct 31 16:16:52 2013 (r257456) @@ -55,7 +55,6 @@ hint.altera_avgen.0.devname="berirom" # # Expose the DE4 flash via an Avalon "generic" device. -# This is incompatible with the isf(4) driver. # #hint.altera_avgen.0.at="nexus0" #hint.altera_avgen.0.maddr=0x74000000 @@ -74,38 +73,3 @@ hint.altera_avgen.0.msize=2 hint.altera_avgen.0.width=1 hint.altera_avgen.0.fileio="r" hint.altera_avgen.0.devname="de4bsw" - -# -# General Intel StrataFlash driver -# -hint.isf.0.at="nexus0" -hint.isf.0.maddr=0x74000000 -hint.isf.0.msize=0x2000000 -hint.isf.1.at="nexus0" -hint.isf.1.maddr=0x76000000 -hint.isf.1.msize=0x2000000 - -# Reserved configuration blocks. Don't touch. -hint.map.0.at="isf0" -hint.map.0.start=0x00000000 -hint.map.0.end=0x00020000 -hint.map.0.name="config" -hint.map.0.readonly=1 - -# Hardwired location of bitfile -hint.map.1.at="isf0" -hint.map.1.start=0x00020000 -hint.map.1.end=0x01820000 -hint.map.1.name="fpga" - -# Kernel on first chip -hint.map.2.at="isf0" -hint.map.2.start=0x01820000 -hint.map.2.end=0x02000000 -hint.map.2.name="reserved" - -# The second chip -hint.map.3.at="isf1" -hint.map.3.start=0x00000000 -hint.map.3.end=0x02000000 -hint.map.3.name="kernel" Modified: stable/10/sys/mips/conf/BERI_DE4_MDROOT ============================================================================== --- stable/10/sys/mips/conf/BERI_DE4_MDROOT Thu Oct 31 15:46:10 2013 (r257455) +++ stable/10/sys/mips/conf/BERI_DE4_MDROOT Thu Oct 31 16:16:52 2013 (r257456) @@ -26,5 +26,4 @@ device altera_sdcard device terasic_de4led device terasic_mtl -device isf device sc Modified: stable/10/sys/mips/conf/BERI_DE4_SDROOT ============================================================================== --- stable/10/sys/mips/conf/BERI_DE4_SDROOT Thu Oct 31 15:46:10 2013 (r257455) +++ stable/10/sys/mips/conf/BERI_DE4_SDROOT Thu Oct 31 16:16:52 2013 (r257456) @@ -20,5 +20,4 @@ device altera_sdcard device terasic_de4led device terasic_mtl -device isf device sc Modified: stable/10/usr.sbin/Makefile ============================================================================== --- stable/10/usr.sbin/Makefile Thu Oct 31 15:46:10 2013 (r257455) +++ stable/10/usr.sbin/Makefile Thu Oct 31 16:16:52 2013 (r257456) @@ -37,7 +37,6 @@ SUBDIR= adduser \ inetd \ iostat \ iscsid \ - isfctl \ kldxref \ mailwrapper \ makefs \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311616.r9VGGrmm060666>