From owner-svn-src-all@FreeBSD.ORG  Fri Dec 30 03:48:40 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13036106564A;
	Fri, 30 Dec 2011 03:48:40 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 01A048FC08;
	Fri, 30 Dec 2011 03:48:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBU3mdMk094162;
	Fri, 30 Dec 2011 03:48:39 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBU3mdef094159;
	Fri, 30 Dec 2011 03:48:39 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201112300348.pBU3mdef094159@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 30 Dec 2011 03:48:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228981 - in head/sys/modules: . cfi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Dec 2011 03:48:40 -0000

Author: marcel
Date: Fri Dec 30 03:48:39 2011
New Revision: 228981
URL: http://svn.freebsd.org/changeset/base/228981

Log:
  Add a module for cfi(4). Build only for arm and powerpc, as there are
  only bus attachments only for these.

Added:
  head/sys/modules/cfi/
  head/sys/modules/cfi/Makefile   (contents, props changed)
Modified:
  head/sys/modules/Makefile

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri Dec 30 02:58:37 2011	(r228980)
+++ head/sys/modules/Makefile	Fri Dec 30 03:48:39 2011	(r228981)
@@ -57,6 +57,7 @@ SUBDIR=	${_3dfx} \
 	cd9660 \
 	cd9660_iconv \
 	${_ce} \
+	${_cfi} \
 	${_ciss} \
 	${_cm} \
 	${_cmx} \
@@ -654,6 +655,10 @@ _zfs=		zfs
 .endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "arm"
+_cfi=		cfi
+.endif
+
 .if ${MACHINE_CPUARCH} == "ia64"
 _aac=		aac
 _aic=		aic
@@ -697,6 +702,7 @@ _xe=		xe
 _agp=		agp
 _an=		an
 _bm=		bm
+_cfi=		cfi
 _cpufreq=	cpufreq
 _nvram=		powermac_nvram
 _smbfs=		smbfs

Added: head/sys/modules/cfi/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/modules/cfi/Makefile	Fri Dec 30 03:48:39 2011	(r228981)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/cfi
+
+KMOD=   cfi
+SRCS=   ${_cfi_bus} cfi_core.c cfi_dev.c
+SRCS+=  bus_if.h device_if.h opt_cfi.h
+
+.if ${MACHINE} == "arm"
+_cfi_bus= cfi_bus_fdt.c cfi_bus_ixp4xx.c
+.endif
+.if ${MACHINE} == "powerpc"
+_cfi_bus= cfi_bus_fdt.c
+.endif
+
+opt_cfi.h:
+	echo "#define CFI_SUPPORT_STRATAFLASH 1" > ${.TARGET}
+
+.include <bsd.kmod.mk>