Date: Sat, 16 Feb 2008 23:01:10 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135534 for review Message-ID: <200802162301.m1GN1AnS064923@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135534 Change 135534 by marcel@marcel_xcllnt on 2008/02/16 23:00:50 Resolve merge... Affected files ... .. //depot/projects/e500/sys/boot/uboot/lib/Makefile#8 edit .. //depot/projects/e500/sys/boot/uboot/lib/api_public.h#3 edit .. //depot/projects/e500/sys/boot/uboot/lib/console.c#4 edit .. //depot/projects/e500/sys/boot/uboot/lib/copy.c#3 edit .. //depot/projects/e500/sys/boot/uboot/lib/devicename.c#4 edit .. //depot/projects/e500/sys/boot/uboot/lib/disk.c#3 edit .. //depot/projects/e500/sys/boot/uboot/lib/elf_freebsd.c#3 edit .. //depot/projects/e500/sys/boot/uboot/lib/glue.c#4 edit .. //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#4 edit .. //depot/projects/e500/sys/boot/uboot/lib/module.c#3 edit .. //depot/projects/e500/sys/boot/uboot/lib/net.c#4 edit .. //depot/projects/e500/sys/boot/uboot/lib/reboot.c#4 edit .. //depot/projects/e500/sys/boot/uboot/lib/time.c#4 edit Differences ... ==== //depot/projects/e500/sys/boot/uboot/lib/Makefile#8 (text+ko) ==== @@ -1,3 +1,4 @@ +# $FreeBSD: src/sys/boot/uboot/lib/Makefile,v 1.1 2008/02/16 22:13:11 marcel Exp $ LIB= uboot INTERNALLIB= ==== //depot/projects/e500/sys/boot/uboot/lib/api_public.h#3 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/sys/boot/uboot/lib/api_public.h,v 1.1 2008/02/16 22:13:11 marcel Exp $ */ + #ifndef _API_PUBLIC_H_ #define _API_PUBLIC_H_ ==== //depot/projects/e500/sys/boot/uboot/lib/console.c#4 (text+ko) ==== @@ -24,6 +24,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/console.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); + #include <stand.h> #include "bootstrap.h" ==== //depot/projects/e500/sys/boot/uboot/lib/copy.c#3 (text+ko) ==== @@ -25,6 +25,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/copy.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); + #include <stand.h> /* ==== //depot/projects/e500/sys/boot/uboot/lib/devicename.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/devicename.c,v 1.7 2005/05/27 19:28:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/devicename.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); #include <stand.h> #include <string.h> ==== //depot/projects/e500/sys/boot/uboot/lib/disk.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.12.2.1 2005/11/30 13:37:22 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/disk.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); /* * Disk I/O routines using U-Boot - TODO ==== //depot/projects/e500/sys/boot/uboot/lib/elf_freebsd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.9.2.1 2005/11/30 13:13:53 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/elf_freebsd.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); #include <sys/param.h> #include <sys/linker.h> ==== //depot/projects/e500/sys/boot/uboot/lib/glue.c#4 (text+ko) ==== @@ -24,6 +24,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); + #include <stand.h> #include "api_public.h" ==== //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#4 (text+ko) ==== @@ -23,6 +23,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/boot/uboot/lib/libuboot.h,v 1.1 2008/02/16 22:13:11 marcel Exp $ */ /* ==== //depot/projects/e500/sys/boot/uboot/lib/module.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_module.c,v 1.7 2004/01/04 23:27:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/module.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); /* * U-Boot-specific module functionality. ==== //depot/projects/e500/sys/boot/uboot/lib/net.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.10 2005/03/02 20:12:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); #include <sys/param.h> #include <sys/types.h> ==== //depot/projects/e500/sys/boot/uboot/lib/reboot.c#4 (text+ko) ==== @@ -24,6 +24,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/reboot.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); + void exit(int code) { ==== //depot/projects/e500/sys/boot/uboot/lib/time.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_time.c,v 1.5 2005/01/05 22:16:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/time.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); #include <stand.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802162301.m1GN1AnS064923>