From owner-svn-src-projects@FreeBSD.ORG  Fri Jan 30 18:34:55 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 524E61065673;
	Fri, 30 Jan 2009 18:34:55 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4137D8FC16;
	Fri, 30 Jan 2009 18:34:55 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0UIYtqr000180;
	Fri, 30 Jan 2009 18:34:55 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0UIYtCb000178;
	Fri, 30 Jan 2009 18:34:55 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901301834.n0UIYtCb000178@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 30 Jan 2009 18:34:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187934 - projects/cambria/sys/arm/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2009 18:34:55 -0000

Author: sam
Date: Fri Jan 30 18:34:54 2009
New Revision: 187934
URL: http://svn.freebsd.org/changeset/base/187934

Log:
  o remove crypto stuff for now, doesn't build
  o add cfi so I can start on flash support

Modified:
  projects/cambria/sys/arm/conf/AVILA
  projects/cambria/sys/arm/conf/AVILA.hints

Modified: projects/cambria/sys/arm/conf/AVILA
==============================================================================
--- projects/cambria/sys/arm/conf/AVILA	Fri Jan 30 18:34:19 2009	(r187933)
+++ projects/cambria/sys/arm/conf/AVILA	Fri Jan 30 18:34:54 2009	(r187934)
@@ -66,13 +66,15 @@ options 	BOOTP_COMPAT
 device		pci
 device		uart
 
+device		ixpwdog		# watchdog timer
+device		cfi		# flash support
+
 # I2C Bus
 device		iicbus
 device		iicbb
 device		iic
 
 device		ixpiic		# I2C bus glue
-device		ixpwdog		# watchdog timer
 device		ds1672		# DS1672 on I2C bus
 device		ad7418		# AD7418 on I2C bus
 
@@ -82,9 +84,9 @@ device		ata
 device		atadisk         # ATA disk drives
 device		avila_ata	# Gateworks CF/IDE support
 
-device		ixpcrypto	# requires npe + qmgr
-device		crypto
-device		cryptodev
+#device		ixpcrypto	# requires npe + qmgr
+#device		crypto
+#device		cryptodev
 
 device		npe		# Network Processing Engine
 device		npe_fw

Modified: projects/cambria/sys/arm/conf/AVILA.hints
==============================================================================
--- projects/cambria/sys/arm/conf/AVILA.hints	Fri Jan 30 18:34:19 2009	(r187933)
+++ projects/cambria/sys/arm/conf/AVILA.hints	Fri Jan 30 18:34:54 2009	(r187934)
@@ -29,6 +29,9 @@ hint.npe.1.mac="C"
 hint.npe.1.mii="B"
 hint.npe.1.phy=1
 
+# FLASH
+hint.cfi.0.at="ixp0"
+
 # NPE crypto acceleration
 hint.ixpcrypto.0.at="ixp0"