From owner-p4-projects@FreeBSD.ORG  Wed Apr 19 16:19:12 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 9556416A40B; Wed, 19 Apr 2006 16:19:12 +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 6E6AD16A409
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 16:19:12 +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 275E943D5C
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 16:19:12 +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 k3JGJC36054969
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 16:19:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JGJBUt054963
	for perforce@freebsd.org; Wed, 19 Apr 2006 16:19:11 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 19 Apr 2006 16:19:11 GMT
Message-Id: <200604191619.k3JGJBUt054963@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 95596 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: Wed, 19 Apr 2006 16:19:12 -0000

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

Change 95596 by imp@imp_hammer on 2006/04/19 16:18:33

	BOOT0 -> BOOT

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#6 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#6 (text+ko) ====

@@ -7,8 +7,8 @@
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Werror
 
-CFLAGS+=-DBOOT0_TSC
-#CFLAGS+=-DBOOT0_KB920X
+CFLAGS+=-DBOOT_TSC
+#CFLAGS+=-DBOOT_KB920X
 
 LIBAT91=${.OBJDIR}/../libat91/libat91.a
 

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 (text) ====

@@ -48,7 +48,7 @@
 	register unsigned	value;
 	volatile sdram_size_t *p = (sdram_size_t *)SDRAM_BASE;
 
-#ifdef BOOT0_TSC
+#ifdef BOOT_TSC
 	// For the TSC board, we turn ON the one LED we have while
 	// early in boot.
 	AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC10;

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 (text) ====

@@ -31,7 +31,7 @@
 
 #define SDRAM_BASE		0x20000000
 
-#ifdef BOOT0_KB9202
+#ifdef BOOT_KB9202
 /* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */
 #define OSC_MAIN_FREQ_DIV	5	/* for 10MHz osc */
 #define SDRAM_WIDTH	AT91C_SDRC_DBW_16_BITS
@@ -39,7 +39,7 @@
 #define OSC_MAIN_MULT		90
 #endif
 
-#ifdef BOOT0_TSC
+#ifdef BOOT_TSC
 /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */
 #define OSC_MAIN_FREQ_DIV	4	/* for 16MHz osc */
 #define SDRAM_WIDTH	AT91C_SDRC_DBW_16_BITS