From owner-p4-projects@FreeBSD.ORG Thu Sep 14 21:48:54 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 99FEB16A47B; Thu, 14 Sep 2006 21:48:54 +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 4F3FB16A403 for ; Thu, 14 Sep 2006 21:48:54 +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 054BB43D46 for ; Thu, 14 Sep 2006 21:48:54 +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 k8ELmr0J084425 for ; Thu, 14 Sep 2006 21:48:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8ELmrvK084422 for perforce@freebsd.org; Thu, 14 Sep 2006 21:48:53 GMT (envelope-from imp@freebsd.org) Date: Thu, 14 Sep 2006 21:48:53 GMT Message-Id: <200609142148.k8ELmrvK084422@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 106122 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: Thu, 14 Sep 2006 21:48:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=106122 Change 106122 by imp@imp_paco-paco on 2006/09/14 21:47:57 IFC fixups Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#10 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.h#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#20 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#9 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/delay.c#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#14 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#8 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/reset.c#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#9 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.h#3 integrate Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#7 (text+ko) ==== @@ -20,7 +20,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.1 2006/08/16 23:39:58 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.2 2006/08/17 00:14:32 imp Exp $ ******************************************************************************/ .equ ARM_MODE_USER, 0x10 ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#10 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.h#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#20 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#9 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/delay.c#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#14 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#8 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/reset.c#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#9 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.h#3 (text+ko) ====