From owner-svn-src-all@FreeBSD.ORG  Wed Jun 17 02:55:54 2009
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 273E2106564A;
	Wed, 17 Jun 2009 02:55:54 +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 15F238FC15;
	Wed, 17 Jun 2009 02:55:54 +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 n5H2trLe060086;
	Wed, 17 Jun 2009 02:55:53 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5H2trDa060084;
	Wed, 17 Jun 2009 02:55:53 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906170255.n5H2trDa060084@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 17 Jun 2009 02:55:53 +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: r194322 - head/sys/arm/xscale/ixp425
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: Wed, 17 Jun 2009 02:55:54 -0000

Author: sam
Date: Wed Jun 17 02:55:53 2009
New Revision: 194322
URL: http://svn.freebsd.org/changeset/base/194322

Log:
  remove IAL vestige for defining the max data/instruction memory size;
  instead of defining them according to ixp46x add new defines so we can
  do this at run time

Modified:
  head/sys/arm/xscale/ixp425/ixp425_npereg.h

Modified: head/sys/arm/xscale/ixp425/ixp425_npereg.h
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425_npereg.h	Wed Jun 17 02:53:05 2009	(r194321)
+++ head/sys/arm/xscale/ixp425/ixp425_npereg.h	Wed Jun 17 02:55:53 2009	(r194322)
@@ -95,7 +95,6 @@
 /*
  * Instruction and Data Memory Size (in words) for each NPE 
  */
-#ifndef __ixp46X
 #define IX_NPEDL_INS_MEMSIZE_WORDS_NPEA     4096
 #define IX_NPEDL_INS_MEMSIZE_WORDS_NPEB     2048
 #define IX_NPEDL_INS_MEMSIZE_WORDS_NPEC     2048
@@ -103,15 +102,9 @@
 #define IX_NPEDL_DATA_MEMSIZE_WORDS_NPEA    2048
 #define IX_NPEDL_DATA_MEMSIZE_WORDS_NPEB    2048
 #define IX_NPEDL_DATA_MEMSIZE_WORDS_NPEC    2048
-#else
-#define IX_NPEDL_INS_MEMSIZE_WORDS_NPEA     4096
-#define IX_NPEDL_INS_MEMSIZE_WORDS_NPEB     4096
-#define IX_NPEDL_INS_MEMSIZE_WORDS_NPEC     4096
 
-#define IX_NPEDL_DATA_MEMSIZE_WORDS_NPEA    4096
-#define IX_NPEDL_DATA_MEMSIZE_WORDS_NPEB    4096
-#define IX_NPEDL_DATA_MEMSIZE_WORDS_NPEC    4096
-#endif
+#define IXP46X_NPEDL_INS_MEMSIZE_WORDS      4096
+#define IXP46X_NPEDL_DATA_MEMSIZE_WORDS     4096
 
 /* BAR offsets */
 #define IX_NPEDL_REG_OFFSET_EXAD             0x00000000	/* Execution Address */