svn commit: r256865 - in head: share/man/man4 sys/conf sys/dev/isf sys/mips/conf usr.sbin usr.sbin/isfctl

[Brooks Davis]

Author: brooks
Date: Mon Oct 21 22:43:38 2013
New Revision: 256865
URL: http://svnweb.freebsd.org/changeset/base/256865

Log:
  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
  MFC after:	3 days

Deleted:
  head/share/man/man4/isf.4
  head/sys/dev/isf/
  head/usr.sbin/isfctl/
Modified:
  head/share/man/man4/Makefile
  head/sys/conf/files
  head/sys/mips/conf/BERI_DE4.hints
  head/sys/mips/conf/BERI_DE4_MDROOT
  head/sys/mips/conf/BERI_DE4_SDROOT
  head/usr.sbin/Makefile

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Mon Oct 21 22:25:54 2013	(r256864)
+++ head/share/man/man4/Makefile	Mon Oct 21 22:43:38 2013	(r256865)
@@ -196,7 +196,6 @@ MAN=	aac.4 \
 	ipwfw.4 \
 	isci.4 \
 	iscsi_initiator.4 \
-	isf.4 \
 	isp.4 \
 	ispfw.4 \
 	iwi.4 \

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Mon Oct 21 22:25:54 2013	(r256864)
+++ head/sys/conf/files	Mon Oct 21 22:43:38 2013	(r256865)
@@ -1541,9 +1541,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: head/sys/mips/conf/BERI_DE4.hints
==============================================================================
--- head/sys/mips/conf/BERI_DE4.hints	Mon Oct 21 22:25:54 2013	(r256864)
+++ head/sys/mips/conf/BERI_DE4.hints	Mon Oct 21 22:43:38 2013	(r256865)
@@ -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: head/sys/mips/conf/BERI_DE4_MDROOT
==============================================================================
--- head/sys/mips/conf/BERI_DE4_MDROOT	Mon Oct 21 22:25:54 2013	(r256864)
+++ head/sys/mips/conf/BERI_DE4_MDROOT	Mon Oct 21 22:43:38 2013	(r256865)
@@ -26,5 +26,4 @@ device		altera_sdcard
 device		terasic_de4led
 device		terasic_mtl
 
-device		isf
 device		sc

Modified: head/sys/mips/conf/BERI_DE4_SDROOT
==============================================================================
--- head/sys/mips/conf/BERI_DE4_SDROOT	Mon Oct 21 22:25:54 2013	(r256864)
+++ head/sys/mips/conf/BERI_DE4_SDROOT	Mon Oct 21 22:43:38 2013	(r256865)
@@ -20,5 +20,4 @@ device		altera_sdcard
 device		terasic_de4led
 device		terasic_mtl
 
-device		isf
 device		sc

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Mon Oct 21 22:25:54 2013	(r256864)
+++ head/usr.sbin/Makefile	Mon Oct 21 22:43:38 2013	(r256865)
@@ -37,7 +37,6 @@ SUBDIR=	adduser \
 	inetd \
 	iostat \
 	iscsid \
-	isfctl \
 	kldxref \
 	mailwrapper \
 	makefs \