From owner-p4-projects@FreeBSD.ORG Fri Apr 28 06:13:41 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 DA9AD16A511; Fri, 28 Apr 2006 06:13:40 +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 808A316A439 for ; Fri, 28 Apr 2006 06:13:40 +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 0EAD943D48 for ; Fri, 28 Apr 2006 06:13:33 +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 k3S6DWX3023875 for ; Fri, 28 Apr 2006 06:13:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3S6DW3h023869 for perforce@freebsd.org; Fri, 28 Apr 2006 06:13:32 GMT (envelope-from imp@freebsd.org) Date: Fri, 28 Apr 2006 06:13:32 GMT Message-Id: <200604280613.k3S6DW3h023869@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 96290 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, 28 Apr 2006 06:13:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=96290 Change 96290 by imp@imp_hammer on 2006/04/28 06:13:27 Looks like we'll need to move env_vars.c as well. They call different routines to get/save this information and are intertwingled with loader_prompt.c in some ugly ways. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#15 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#8 branch .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.h#4 branch .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#12 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.c#6 delete .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.h#4 delete Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#15 (text+ko) ==== @@ -2,7 +2,7 @@ P=bootiic FILES=${P} -SRCS=arm_init.S main.c loader_prompt.c +SRCS=arm_init.S main.c loader_prompt.c env_vars.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#6 (text+ko) ==== @@ -2,7 +2,7 @@ P=bootspi FILES=${P} -SRCS=arm_init.s main.c loader_prompt.c +SRCS=arm_init.s main.c loader_prompt.c env_vars.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#12 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= at91 INTERNALLIB= -SRCS=at91rm9200_lowlevel.c eeprom.c emac.c env_vars.c getc.c \ +SRCS=at91rm9200_lowlevel.c eeprom.c emac.c getc.c \ p_string.c putchar.c printf.c reset.c spi_flash.c xmodem.c NO_MAN=