From owner-svn-src-head@FreeBSD.ORG  Tue Mar  9 00:50:59 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 311071065674;
	Tue,  9 Mar 2010 00:50:59 +0000 (UTC)
	(envelope-from ticso@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D8078FC1B;
	Tue,  9 Mar 2010 00:50:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o290owMb057811;
	Tue, 9 Mar 2010 00:50:58 GMT (envelope-from ticso@svn.freebsd.org)
Received: (from ticso@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o290ow9I057808;
	Tue, 9 Mar 2010 00:50:58 GMT (envelope-from ticso@svn.freebsd.org)
Message-Id: <201003090050.o290ow9I057808@svn.freebsd.org>
From: Bernd Walter <ticso@FreeBSD.org>
Date: Tue, 9 Mar 2010 00:50:58 +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: r204900 - in head/sys/boot/arm/at91: boot2 libat91
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Mar 2010 00:51:00 -0000

Author: ticso
Date: Tue Mar  9 00:50:58 2010
New Revision: 204900
URL: http://svn.freebsd.org/changeset/base/204900

Log:
  BWCT boards can have 128MB SDRAM.

Modified:
  head/sys/boot/arm/at91/boot2/bwct_board.c
  head/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c

Modified: head/sys/boot/arm/at91/boot2/bwct_board.c
==============================================================================
--- head/sys/boot/arm/at91/boot2/bwct_board.c	Tue Mar  9 00:48:06 2010	(r204899)
+++ head/sys/boot/arm/at91/boot2/bwct_board.c	Tue Mar  9 00:50:58 2010	(r204900)
@@ -90,7 +90,11 @@ board_init(void)
 	printf("BWCT FSB-A920-1\n");
 	printf("http://www.bwct.de\n");
 	printf("\n");
-	printf("AT92RM9200 180MHz\n");
+#if defined(SDRAM_128M)
+	printf("AT92RM9200 180MHz 128MB\n");
+#else
+	printf("AT92RM9200 180MHz 64MB\n");
+#endif
 	printf("Initialising USART0\n");
 	USART0_Init();
 	printf("Initialising USART1\n");

Modified: head/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c
==============================================================================
--- head/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c	Tue Mar  9 00:48:06 2010	(r204899)
+++ head/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c	Tue Mar  9 00:50:58 2010	(r204900)
@@ -136,7 +136,7 @@ _init(void)
 	AT91C_BASE_EBI->EBI_CSA = value;
 
 	AT91C_BASE_SDRC->SDRC_CR =
-#ifdef KB9202_B
+#if defined(KB9202_B) || defined(SDRAM_128M)
 	    AT91C_SDRC_NC_10 |
 #else
 	    AT91C_SDRC_NC_9 |