From owner-p4-projects@FreeBSD.ORG Mon Aug 21 20:40:59 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 523BF16A4E1; Mon, 21 Aug 2006 20:40:59 +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 226B016A4DE for ; Mon, 21 Aug 2006 20:40:59 +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 BE41743D4C for ; Mon, 21 Aug 2006 20:40:58 +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 k7LKewmO038948 for ; Mon, 21 Aug 2006 20:40:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7LKew3R038945 for perforce@freebsd.org; Mon, 21 Aug 2006 20:40:58 GMT (envelope-from imp@freebsd.org) Date: Mon, 21 Aug 2006 20:40:58 GMT Message-Id: <200608212040.k7LKew3R038945@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 104719 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: Mon, 21 Aug 2006 20:40:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=104719 Change 104719 by imp@imp_lighthouse on 2006/08/21 20:40:40 Use the SPI boot arm_init.S file rather than our (wrong) one for iic. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/arm_init.s#2 delete Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#3 (text+ko) ==== @@ -1,10 +1,12 @@ # $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $ +.PATH: ${.CURDIR}/../bootspi + BOOT_COMCONSOLE_SPEED?= 9600 P=boot2 FILES=${P} -SRCS=arm_init.s boot2.c ashldi3.c divsi3.S +SRCS=arm_init.S boot2.c ashldi3.c divsi3.S NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g}