aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2019-02-06 11:12:30 -0800
committerH. Peter Anvin (Intel) <hpa@zytor.com>2019-02-06 11:12:30 -0800
commit754b1ab222d9c3a5c2e0d481e7cee409c716b0f4 (patch)
treee1e087fb9143b67028b17d27763d23de705fca49
parent03b433202dc8970042381e6c12805a8c797cb84d (diff)
parenta3a10a4ed0eb088ae442779498587234c03ae288 (diff)
downloadsyslinux-754b1ab222d9c3a5c2e0d481e7cee409c716b0f4.tar.gz
syslinux-754b1ab222d9c3a5c2e0d481e7cee409c716b0f4.tar.xz
syslinux-754b1ab222d9c3a5c2e0d481e7cee409c716b0f4.zip
Merge remote-tracking branch 'joakim/master'
-rwxr-xr-xefi/build-gnu-efi.sh2
-rwxr-xr-xefi/clean-gnu-efi.sh2
-rw-r--r--efi/fio.h9
-rw-r--r--efi/main.c5
m---------gnu-efi0
5 files changed, 4 insertions, 14 deletions
diff --git a/efi/build-gnu-efi.sh b/efi/build-gnu-efi.sh
index e72d8720..63460b69 100755
--- a/efi/build-gnu-efi.sh
+++ b/efi/build-gnu-efi.sh
@@ -37,7 +37,7 @@ fi
mkdir -p "$objdir/gnu-efi"
cd "$objdir/gnu-efi"
-EFIDIR="$(readlink -f "$objdir/../gnu-efi/gnu-efi-3.0")"
+EFIDIR="$(readlink -f "$objdir/../gnu-efi")"
make SRCDIR="$EFIDIR" TOPDIR="$EFIDIR" -f "$EFIDIR/Makefile" ARCH=$ARCH
make SRCDIR="$EFIDIR" TOPDIR="$EFIDIR" -f "$EFIDIR/Makefile" ARCH=$ARCH PREFIX="$objdir" install
diff --git a/efi/clean-gnu-efi.sh b/efi/clean-gnu-efi.sh
index 58def28c..bc950261 100755
--- a/efi/clean-gnu-efi.sh
+++ b/efi/clean-gnu-efi.sh
@@ -30,7 +30,7 @@ objdir=$(readlink -f "$2")
if [ -d "$objdir/gnu-efi" ];then
cd "$objdir/gnu-efi"
- EFIDIR="$(readlink -f "$objdir/../gnu-efi/gnu-efi-3.0")"
+ EFIDIR="$(readlink -f "$objdir/../gnu-efi")"
make SRCDIR="$EFIDIR" TOPDIR="$EFIDIR" -f "$EFIDIR/Makefile" ARCH=$ARCH clean
fi
diff --git a/efi/fio.h b/efi/fio.h
index 65fff8df..a1bfe68d 100644
--- a/efi/fio.h
+++ b/efi/fio.h
@@ -11,15 +11,6 @@
#define MAX_EFI_ARGS 64
#define WS(c16) (c16 == L' ' || c16 == CHAR_TAB)
-/* VPrint is not in export declarations in gnu-efi lib yet
- * although it is a global function; declare it here
- */
-extern UINTN
-VPrint (
- IN CHAR16 *fmt,
- va_list args
- );
-
extern EFI_STATUS efi_errno;
void efi_memcpy(unsigned char *dst, unsigned char *src, size_t len);
diff --git a/efi/main.c b/efi/main.c
index fd95f5c8..92546de6 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -10,7 +10,6 @@
#include <syslinux/firmware.h>
#include <syslinux/linux.h>
#include <sys/ansi.h>
-#include <setjmp.h>
#include "efi.h"
#include "fio.h"
@@ -185,7 +184,7 @@ __export void local_boot(uint16_t ax)
* Inform the firmware that we failed to execute correctly, which
* will trigger the next entry in the EFI Boot Manager list.
*/
- longjmp(load_error_buf, 1);
+ longjmp(&load_error_buf, 1);
}
void bios_timer_cleanup(void)
@@ -1383,7 +1382,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *table)
status = uefi_call_wrapper(in->ReadKeyStroke, 2, in, &key);
} while (status == EFI_SUCCESS);
- if (!setjmp(load_error_buf))
+ if (!setjmp(&load_error_buf))
load_env32(NULL);
/* load_env32() failed.. cancel timer and bailout */
diff --git a/gnu-efi b/gnu-efi
-Subproject ab54e2b40e914d0ca01dc3d44c8d4eb8517bf99
+Subproject af5d1494a91617c87521101f6f5979dfbd95903