Module Name: src
Committed By: scole
Date: Thu Aug 4 18:07:43 UTC 2016
Modified Files:
src/sys/arch/ia64/stand/efi/libefi: bootinfo.c copy.c efi.c efifpswa.c
exec.c time.c
src/sys/arch/ia64/stand/ia64: Makefile.booters
src/sys/arch/ia64/stand/ia64/efi: main.c
Added Files:
src/sys/arch/ia64/include: efilib.h
Removed Files:
src/sys/arch/ia64/stand/efi/include: README efi.h efi_nii.h efiapi.h
eficon.h efidebug.h efidef.h efidevp.h efierr.h efifpswa.h efifs.h
efilib.h efinet.h efipart.h efiprot.h efipxebc.h efiser.h
efistdarg.h
src/sys/arch/ia64/stand/efi/include/ia64: efibind.h pe.h
Log Message:
PR port-ia64/50719
Remove duplicate EFI files for ia64
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/ia64/include/efilib.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/ia64/stand/efi/include/README \
src/sys/arch/ia64/stand/efi/include/efi.h \
src/sys/arch/ia64/stand/efi/include/efi_nii.h \
src/sys/arch/ia64/stand/efi/include/efiapi.h \
src/sys/arch/ia64/stand/efi/include/eficon.h \
src/sys/arch/ia64/stand/efi/include/efidebug.h \
src/sys/arch/ia64/stand/efi/include/efidef.h \
src/sys/arch/ia64/stand/efi/include/efidevp.h \
src/sys/arch/ia64/stand/efi/include/efifpswa.h \
src/sys/arch/ia64/stand/efi/include/efifs.h \
src/sys/arch/ia64/stand/efi/include/efilib.h \
src/sys/arch/ia64/stand/efi/include/efinet.h \
src/sys/arch/ia64/stand/efi/include/efipart.h \
src/sys/arch/ia64/stand/efi/include/efiprot.h \
src/sys/arch/ia64/stand/efi/include/efipxebc.h \
src/sys/arch/ia64/stand/efi/include/efiser.h \
src/sys/arch/ia64/stand/efi/include/efistdarg.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/ia64/stand/efi/include/efierr.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/ia64/stand/efi/include/ia64/efibind.h \
src/sys/arch/ia64/stand/efi/include/ia64/pe.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/efi/libefi/bootinfo.c \
src/sys/arch/ia64/stand/efi/libefi/copy.c \
src/sys/arch/ia64/stand/efi/libefi/efi.c \
src/sys/arch/ia64/stand/efi/libefi/efifpswa.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/efi/libefi/exec.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/efi/libefi/time.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/ia64/Makefile.booters
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/stand/ia64/efi/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/stand/efi/libefi/bootinfo.c
diff -u src/sys/arch/ia64/stand/efi/libefi/bootinfo.c:1.4 src/sys/arch/ia64/stand/efi/libefi/bootinfo.c:1.5
--- src/sys/arch/ia64/stand/efi/libefi/bootinfo.c:1.4 Thu Dec 27 20:21:51 2012
+++ src/sys/arch/ia64/stand/efi/libefi/bootinfo.c Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
+/* $NetBSD: bootinfo.c,v 1.5 2016/08/04 18:07:43 scole Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -48,6 +48,8 @@
#include <efilib.h>
#include <efiboot.h>
+#include <machine/efilib.h>
+
#include "bootstrap.h"
static EFI_GUID hcdp = HCDP_TABLE_GUID;
Index: src/sys/arch/ia64/stand/efi/libefi/copy.c
diff -u src/sys/arch/ia64/stand/efi/libefi/copy.c:1.4 src/sys/arch/ia64/stand/efi/libefi/copy.c:1.5
--- src/sys/arch/ia64/stand/efi/libefi/copy.c:1.4 Mon Oct 26 19:16:56 2009
+++ src/sys/arch/ia64/stand/efi/libefi/copy.c Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.c,v 1.4 2009/10/26 19:16:56 cegger Exp $ */
+/* $NetBSD: copy.c,v 1.5 2016/08/04 18:07:43 scole Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -35,6 +35,7 @@
#include <efilib.h>
#include <lib/libsa/stand.h>
+#include <machine/efilib.h>
int
efi_copyin(void *src, vaddr_t va, size_t len)
Index: src/sys/arch/ia64/stand/efi/libefi/efi.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efi.c:1.4 src/sys/arch/ia64/stand/efi/libefi/efi.c:1.5
--- src/sys/arch/ia64/stand/efi/libefi/efi.c:1.4 Thu Dec 27 20:21:51 2012
+++ src/sys/arch/ia64/stand/efi/libefi/efi.c Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: efi.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
+/* $NetBSD: efi.c,v 1.5 2016/08/04 18:07:43 scole Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -34,6 +34,8 @@
#include <lib/libsa/stand.h>
#include <lib/libkern/libkern.h>
+#include <machine/efilib.h>
+
EFI_HANDLE IH;
EFI_SYSTEM_TABLE *ST;
EFI_BOOT_SERVICES *BS;
Index: src/sys/arch/ia64/stand/efi/libefi/efifpswa.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efifpswa.c:1.4 src/sys/arch/ia64/stand/efi/libefi/efifpswa.c:1.5
--- src/sys/arch/ia64/stand/efi/libefi/efifpswa.c:1.4 Sun Jul 17 20:54:42 2011
+++ src/sys/arch/ia64/stand/efi/libefi/efifpswa.c Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: efifpswa.c,v 1.4 2011/07/17 20:54:42 joerg Exp $ */
+/* $NetBSD: efifpswa.c,v 1.5 2016/08/04 18:07:43 scole Exp $ */
/*-
* Copyright (c) 2001 Peter Wemm <[email protected]>
@@ -36,6 +36,7 @@
#include <efi.h>
#include <efilib.h>
+#include <efifpswa.h>
#include <bootstrap.h>
#include "efiboot.h"
Index: src/sys/arch/ia64/stand/efi/libefi/exec.c
diff -u src/sys/arch/ia64/stand/efi/libefi/exec.c:1.6 src/sys/arch/ia64/stand/efi/libefi/exec.c:1.7
--- src/sys/arch/ia64/stand/efi/libefi/exec.c:1.6 Thu Dec 27 20:21:51 2012
+++ src/sys/arch/ia64/stand/efi/libefi/exec.c Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.6 2012/12/27 20:21:51 martin Exp $ */
+/* $NetBSD: exec.c,v 1.7 2016/08/04 18:07:43 scole Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -83,6 +83,8 @@
#include <efilib.h>
#include <efiboot.h>
+#include <machine/efilib.h>
+
#include "bootstrap.h"
#define _KERNEL
Index: src/sys/arch/ia64/stand/efi/libefi/time.c
diff -u src/sys/arch/ia64/stand/efi/libefi/time.c:1.3 src/sys/arch/ia64/stand/efi/libefi/time.c:1.4
--- src/sys/arch/ia64/stand/efi/libefi/time.c:1.3 Wed Mar 18 10:22:31 2009
+++ src/sys/arch/ia64/stand/efi/libefi/time.c Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.3 2009/03/18 10:22:31 cegger Exp $ */
+/* $NetBSD: time.c,v 1.4 2016/08/04 18:07:43 scole Exp $ */
/*-
* Copyright (c) 1999, 2000
@@ -48,6 +48,8 @@
#include <sys/time.h>
+#include <machine/efilib.h>
+
/*
// Accurate only for the past couple of centuries;
// that will probably do.
Index: src/sys/arch/ia64/stand/ia64/Makefile.booters
diff -u src/sys/arch/ia64/stand/ia64/Makefile.booters:1.7 src/sys/arch/ia64/stand/ia64/Makefile.booters:1.8
--- src/sys/arch/ia64/stand/ia64/Makefile.booters:1.7 Thu Aug 4 16:22:40 2016
+++ src/sys/arch/ia64/stand/ia64/Makefile.booters Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.7 2016/08/04 16:22:40 scole Exp $
+# $NetBSD: Makefile.booters,v 1.8 2016/08/04 18:07:43 scole Exp $
.include <bsd.own.mk>
.include <bsd.klinks.mk>
@@ -15,10 +15,12 @@ LIBC= # nothing
COPTS= -Os -ffreestanding
IA64_STAND_DIR?= $S/arch/ia64/stand
+IA64_EFI_DIR= $S/external/bsd/gnu-efi/dist
.PATH: ${IA64_STAND_DIR}/efi
-CPPFLAGS += -nostdlib -nostdinc -I${.OBJDIR} -I${IA64_STAND_DIR} -I${IA64_STAND_DIR}/efi/include
+CPPFLAGS += -nostdlib -nostdinc -I${.OBJDIR} -I${IA64_STAND_DIR}
+CPPFLAGS += -I${IA64_EFI_DIR}/inc -I${IA64_EFI_DIR}/inc/ia64
# Options used when building standalone components
CFLAGS+= -ffreestanding -fshort-wchar -Wformat -D_STANDALONE
Index: src/sys/arch/ia64/stand/ia64/efi/main.c
diff -u src/sys/arch/ia64/stand/ia64/efi/main.c:1.10 src/sys/arch/ia64/stand/ia64/efi/main.c:1.11
--- src/sys/arch/ia64/stand/ia64/efi/main.c:1.10 Thu Aug 4 16:22:40 2016
+++ src/sys/arch/ia64/stand/ia64/efi/main.c Thu Aug 4 18:07:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.10 2016/08/04 16:22:40 scole Exp $ */
+/* $NetBSD: main.c,v 1.11 2016/08/04 18:07:43 scole Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -41,6 +41,8 @@
#include <efilib.h>
#include <efifsdev.h>
+#include <machine/efilib.h>
+
#include "bootstrap.h"
#include "efiboot.h"
Added files:
Index: src/sys/arch/ia64/include/efilib.h
diff -u /dev/null src/sys/arch/ia64/include/efilib.h:1.1
--- /dev/null Thu Aug 4 18:07:43 2016
+++ src/sys/arch/ia64/include/efilib.h Thu Aug 4 18:07:43 2016
@@ -0,0 +1,42 @@
+/* $NetBSD: efilib.h,v 1.1 2016/08/04 18:07:43 scole Exp $ */
+
+/*-
+ * Copyright (c) 2000 Doug Rabson
+ * Copyright (c) 2006 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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: releng/10.1/sys/boot/efi/include/efilib.h 271135 2014-09-04 21:01:10Z emaste $
+ */
+extern EFI_HANDLE IH;
+extern EFI_SYSTEM_TABLE *ST;
+extern EFI_BOOT_SERVICES *BS;
+extern EFI_RUNTIME_SERVICES *RS;
+
+void *efi_get_table(EFI_GUID *tbl);
+void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table);
+
+EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS);
+
+EFI_STATUS main(int argc, CHAR16 *argv[]);
+void efi_exit(EFI_STATUS status);
