From owner-p4-projects@FreeBSD.ORG Tue Apr 18 17:46:17 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 40EB416A40E; Tue, 18 Apr 2006 17:46:17 +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 1CBBA16A40B for ; Tue, 18 Apr 2006 17:46:17 +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 48B3043D58 for ; Tue, 18 Apr 2006 17:46:16 +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 k3IHkGN6062907 for ; Tue, 18 Apr 2006 17:46:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IHkFdL062904 for perforce@freebsd.org; Tue, 18 Apr 2006 17:46:15 GMT (envelope-from imp@freebsd.org) Date: Tue, 18 Apr 2006 17:46:15 GMT Message-Id: <200604181746.k3IHkFdL062904@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 95501 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: Tue, 18 Apr 2006 17:46:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=95501 Change 95501 by imp@imp_hammer on 2006/04/18 17:46:15 Move most of the boot loader into libat91 Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#9 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#7 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.h#3 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/linker.cfg#3 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#8 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#5 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/linker.cfg#1 branch Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#9 (text+ko) ==== @@ -2,9 +2,9 @@ P=bootiic FILES=${P} -SRCS=arm_init.s main.c env_vars.c loader_prompt.c +SRCS=arm_init.s main.c NO_MAN= -LDFLAGS=-e 0 -T linker.cfg +LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#5 (text+ko) ==== @@ -2,8 +2,8 @@ LIB= at91 INTERNALLIB= -SRCS=at91rm9200_lowlevel.c eeprom.c getc.c putchar.c printf.c xmodem.c \ - emac.c p_string.c +SRCS=at91rm9200_lowlevel.c eeprom.c emac.c env_vars.c getc.c loader_prompt.c \ + p_string.c putchar.c printf.c xmodem.c NO_MAN= .include