From owner-p4-projects@FreeBSD.ORG Tue Apr 18 17:40:13 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 A42B616A409; Tue, 18 Apr 2006 17:40:13 +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 7C68616A401 for ; Tue, 18 Apr 2006 17:40:13 +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 3E0AD43D77 for ; Tue, 18 Apr 2006 17:40:08 +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 k3IHe8Jh055530 for ; Tue, 18 Apr 2006 17:40:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IHe7KM055527 for perforce@freebsd.org; Tue, 18 Apr 2006 17:40:07 GMT (envelope-from imp@freebsd.org) Date: Tue, 18 Apr 2006 17:40:07 GMT Message-Id: <200604181740.k3IHe7KM055527@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 95500 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:40:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=95500 Change 95500 by imp@imp_hammer on 2006/04/18 17:39:41 Move more and more of bootiic into libat91. We'll be needing most of bootiic in bootspi. Unsure how to handle the 'stripting' that's in bootiic since it relies on data from the iic eeprom and writing to the spi eeprom is somewhat different. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/emac.c#7 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/emac.h#4 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/p_string.c#4 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/p_string.h#4 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/tag_list.c#3 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/tag_list.h#3 delete .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#8 (text+ko) ==== @@ -2,8 +2,7 @@ P=bootiic FILES=${P} -SRCS=arm_init.s main.c \ - env_vars.c loader_prompt.c p_string.c emac.c +SRCS=arm_init.s main.c env_vars.c loader_prompt.c NO_MAN= LDFLAGS=-e 0 -T linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#4 (text+ko) ==== @@ -2,7 +2,8 @@ LIB= at91 INTERNALLIB= -SRCS=at91rm9200_lowlevel.c eeprom.c getc.c putchar.c printf.c xmodem.c +SRCS=at91rm9200_lowlevel.c eeprom.c getc.c putchar.c printf.c xmodem.c \ + emac.c p_string.c NO_MAN= .include