Date: Wed, 25 Oct 2006 23:23:45 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 108447 for review Message-ID: <200610252323.k9PNNjNK010080@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=108447 Change 108447 by marcel@marcel_cluster on 2006/10/25 23:22:53 Move the ia64 specific files from efi/libefi to ia64/common where they will be unified with the same files under ia64/ski. Affected files ... .. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#12 edit .. //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#16 delete .. //depot/projects/ia64/sys/boot/efi/libefi/copy.c#5 delete .. //depot/projects/ia64/sys/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#12 delete .. //depot/projects/ia64/sys/boot/ia64/common/bootinfo.c#1 add .. //depot/projects/ia64/sys/boot/ia64/common/copy.c#1 add .. //depot/projects/ia64/sys/boot/ia64/common/devicename.c#1 add .. //depot/projects/ia64/sys/boot/ia64/common/elf_freebsd.c#1 add .. //depot/projects/ia64/sys/boot/ia64/efi/Makefile#5 edit .. //depot/projects/ia64/sys/boot/ia64/efi/main.c#2 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/libefi/Makefile#12 (text+ko) ==== @@ -1,16 +1,9 @@ # $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} - LIB= efi INTERNALLIB= -SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ - elf_freebsd.c libefi.c module.c time.c - -.if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c pal.S -.endif +SRCS= delay.c efi_console.c efifs.c efinet.c libefi.c module.c time.c CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} @@ -19,9 +12,4 @@ # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -# Make the disk code more talkative -.if defined(BOOT_DISK_DEBUG) -CFLAGS+= -DDISK_DEBUG -.endif - .include <bsd.lib.mk> ==== //depot/projects/ia64/sys/boot/ia64/efi/Makefile#5 (text+ko) ==== @@ -6,7 +6,8 @@ PROG= loader.sym INTERNALPROG= -SRCS= conf.c dev_net.c efimd.c main.c start.S vers.c +SRCS= bootinfo.c conf.c copy.c dev_net.c devicename.c efifpswa.c \ + efimd.c elf_freebsd.c main.c pal.S start.S vers.c CFLAGS+= -DLOADER CFLAGS+= -I${.CURDIR}/../../efi/include @@ -22,6 +23,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif +.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} + # Always add MI sources .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc" ==== //depot/projects/ia64/sys/boot/ia64/efi/main.c#2 (text+ko) ==== @@ -42,6 +42,10 @@ #include "bootstrap.h" #include "efiboot.h" +/* DIG64 Headless Console & Debug Port Table. */ +#define HCDP_TABLE_GUID \ + {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} + extern char bootprog_name[]; extern char bootprog_rev[]; extern char bootprog_date[];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610252323.k9PNNjNK010080>