From owner-p4-projects@FreeBSD.ORG Fri Jul 14 22:11:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E11AB16A4E8; Fri, 14 Jul 2006 22:11:57 +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 A79A816A4DA for ; Fri, 14 Jul 2006 22:11:57 +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 BA30443D46 for ; Fri, 14 Jul 2006 22:11:56 +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 k6EMBuvl053490 for ; Fri, 14 Jul 2006 22:11:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6EMBuo5053486 for perforce@freebsd.org; Fri, 14 Jul 2006 22:11:56 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Jul 2006 22:11:56 GMT Message-Id: <200607142211.k6EMBuo5053486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 101609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2006 22:11:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=101609 Change 101609 by imp@imp_harmony on 2006/07/14 22:11:37 IFC @101606 + fixups (this is loopback from FreeBSD) Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pdcreg.h#5 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_pio_rm9200.h#2 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#19 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#6 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#7 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spireg.h#6 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#37 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/doit.c#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#12 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.S#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.c#14 branch .. //depot/projects/arm/src/sys/conf/options.arm#13 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pdcreg.h#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_pio_rm9200.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_piovar.h#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.2 2006/06/17 23:22:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.3 2006/07/14 22:01:51 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.1 2006/03/24 07:35:30 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.2 2006/07/14 21:37:19 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.2 2006/07/14 21:35:59 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_spireg.h#6 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.2 2006/07/14 21:35:59 imp Exp $ */ #ifndef ARM_AT91_AT91_SPIREG_H #define ARM_AT91_AT91_SPIREG_H ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#37 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.7 2006/07/02 03:45:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.8 2006/07/14 21:33:04 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#6 (text) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/doit.c#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#3 (text) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#6 (text) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#12 (text) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.S#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/conf/options.arm#13 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.10 2006/06/06 21:06:57 cognet Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.11 2006/07/14 21:59:54 imp Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h