From owner-p4-projects@FreeBSD.ORG  Sun Dec 11 06:07:43 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F8E816A422; Sun, 11 Dec 2005 06:07:43 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 42F8D16A41F
	for <perforce@freebsd.org>; Sun, 11 Dec 2005 06:07:43 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0D42C43D53
	for <perforce@freebsd.org>; Sun, 11 Dec 2005 06:07:43 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBB67gRH083190
	for <perforce@freebsd.org>; Sun, 11 Dec 2005 06:07:42 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBB67g9e083187
	for perforce@freebsd.org; Sun, 11 Dec 2005 06:07:42 GMT
	(envelope-from imp@freebsd.org)
Date: Sun, 11 Dec 2005 06:07:42 GMT
Message-Id: <200512110607.jBB67g9e083187@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 88022 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: Sun, 11 Dec 2005 06:07:44 -0000

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

Change 88022 by imp@imp_plunger on 2005/12/11 06:07:13

	Minor uart tweaks.  The console is on DBGU not USART0 on the KB9202,
	so hard wire it there.  Add commented out x86 specific code that
	I hope to soon make non x86 specific.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#4 (text+ko) ====

@@ -54,20 +54,23 @@
 int
 uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 {
-        uint32_t *ptr = (uint32_t *)(AT91RM92_BASE + AT91RM92_SYS_BASE);
-        *(uint32_t *)((char *)ptr + PIOC_SODR) = AT91RM92_PIO_PC18;
-        *(uint32_t *)((char *)ptr + PIOC_SODR) = AT91RM92_PIO_PC19;
-        *(uint32_t *)((char *)ptr + PIOC_SODR) = AT91RM92_PIO_PC20;
-        
+#if 0
+	/*
+	 * We can't enable this yet since it is ns8250 specific
+	 * at the moment.
+	 */
+	/* Check the environment. */
+	if (uart_getenv(devtype, di) == 0)
+		return (0);
+#endif
 #ifdef CONSOLE_USART
 	di->ops = usart_at91rm92_ops;
 	di->bas.chan = 0;
 	di->bas.bst = &at91rm92_bs_tag;
 	/* 
 	 * XXX: Not pretty, but will work because we map VA == PA early
-	 * for some devices.
+	 * for the last 1MB of memory.
 	 */
-	di->bas.bsh = AT91RM92_BASE + AT91RM92_USART0_BASE;
 	di->bas.bsh = AT91RM92_BASE + AT91RM92_SYS_BASE + DBGU_CR;
 	di->bas.regshft = 0;
 	di->bas.rclk = 0;