From owner-p4-projects@FreeBSD.ORG  Sat May  9 01:04:45 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8DEBB1065679; Sat,  9 May 2009 01:04:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 434591065672
	for <perforce@freebsd.org>; Sat,  9 May 2009 01:04:45 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 312998FC1B
	for <perforce@freebsd.org>; Sat,  9 May 2009 01:04:45 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4914jDb054330
	for <perforce@freebsd.org>; Sat, 9 May 2009 01:04:45 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4914jlr054328
	for perforce@freebsd.org; Sat, 9 May 2009 01:04:45 GMT
	(envelope-from andrew@freebsd.org)
Date: Sat, 9 May 2009 01:04:45 GMT
Message-Id: <200905090104.n4914jlr054328@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 161796 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 May 2009 01:04:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=161796

Change 161796 by andrew@andrew_bender on 2009/05/09 01:03:48

	Use the correct uart on the NeoFreerunner

Affected files ...

.. //depot/projects/arm/src/sys/arm/s3c2xx0/board_neo.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/s3c2xx0/board_neo.c#2 (text+ko) ====

@@ -51,12 +51,23 @@
 #include <arm/s3c2xx0/s3c2410reg.h>
 #include <arm/s3c2xx0/s3c2xx0board.h>
 
+#define	ioreg_read32(a)  	(*(volatile uint32_t *)(a))
+
 extern vm_offset_t s3c2410_uart_vaddr;
 
 long
 board_init(void)
 {
-	s3c2410_uart_vaddr = S3C24X0_UART_BASE(0);
+	switch(ioreg_read32(S3C24X0_GPIO_BASE + GPIO_GSTATUS1) >> 16) {
+	case 0x3241:
+		/* We are on a Neo1973 or Qemu */
+		s3c2410_uart_vaddr = S3C24X0_UART_BASE(0);
+		break;
+	case 0x3244:
+		/* We are on a Neo Freerunner */
+		s3c2410_uart_vaddr = S3C24X0_UART_BASE(2);
+		break;
+	}
 
 	/* TODO: Use s3c2xx0_ramsize */
 	return (128 * 1024 * 1024);