From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 17:44:07 2006
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 374E116A4DE; Thu,  6 Jul 2006 17:44:07 +0000 (UTC)
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 ED6FF16A4DA
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 17:44:06 +0000 (UTC)
	(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 BAC6C43D45
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 17:44:06 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66Hi6ZM012869
	for <perforce@freebsd.org>; Thu, 6 Jul 2006 17:44:06 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66Hi6UA012866
	for perforce@freebsd.org; Thu, 6 Jul 2006 17:44:06 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 6 Jul 2006 17:44:06 GMT
Message-Id: <200607061744.k66Hi6UA012866@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 100778 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: Thu, 06 Jul 2006 17:44:07 -0000

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

Change 100778 by imp@imp_lighthouse on 2006/07/06 17:43:41

	ifdef our stuff in.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#28 edit
.. //depot/projects/arm/src/sys/arm/conf/KB920X#35 edit

Differences ...

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

@@ -45,6 +45,7 @@
 
 #include "opt_msgbuf.h"
 #include "opt_ddb.h"
+#include "opt_at91.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.8 2006/06/20 23:40:04 imp Exp $");
@@ -227,10 +228,12 @@
 	at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB20_TXD1, 1);
 
 	/* Pin assignment */
+#if AT91_TSC
 	/* Assert PA24 low -- talk to rubidium */
 	at91_pio_use_gpio(AT91RM92_PIOA_BASE, AT91C_PIO_PA24);
 	at91_pio_gpio_output(AT91RM92_PIOA_BASE, AT91C_PIO_PA24, 0);
 	at91_pio_gpio_clear(AT91RM92_PIOA_BASE, AT91C_PIO_PA24);
+#endif
 
 	return (ramsize());
 }

==== //depot/projects/arm/src/sys/arm/conf/KB920X#35 (text+ko) ====

@@ -25,6 +25,7 @@
 options		KERNVIRTADDR=0xc0000000	
 options		PHYSADDR=0x20000000
 options		STARTUP_PAGETABLE_ADDR=0x20800000
+options		AT91_TSC
 include		"../at91/std.kb920x"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.