summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2016-09-24 13:40:13 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2016-09-24 13:40:13 +0000
commitf07f96ab40c87fd2ac7c668c8a9e0d9fc8b46f71 (patch)
tree8b359173b4017e04c0deedf9f571cea38104252f /sys/arch
parenteecbc31b78358ff7995f545de178c461af9a1e6a (diff)
Pass esym to the kernel in r0. Since u-boot passes 0 in this register, we
can easily determine that the value passed is valid and use it to initialize the kernel symbol tableo. ok tom@, patrick@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/armv7/stand/efiboot/conf.c4
-rw-r--r--sys/arch/armv7/stand/efiboot/exec.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/armv7/stand/efiboot/conf.c b/sys/arch/armv7/stand/efiboot/conf.c
index e0b9a99e279..447dffcbf9b 100644
--- a/sys/arch/armv7/stand/efiboot/conf.c
+++ b/sys/arch/armv7/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2016/09/13 18:27:49 jasper Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2016/09/24 13:40:12 kettenis Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -35,7 +35,7 @@
#include "efiboot.h"
#include "efidev.h"
-const char version[] = "0.2";
+const char version[] = "0.3";
int debug = 0;
struct fs_ops file_system[] = {
diff --git a/sys/arch/armv7/stand/efiboot/exec.c b/sys/arch/armv7/stand/efiboot/exec.c
index 76bdd29f040..e9c55aa4b85 100644
--- a/sys/arch/armv7/stand/efiboot/exec.c
+++ b/sys/arch/armv7/stand/efiboot/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.8 2016/06/21 15:39:51 kettenis Exp $ */
+/* $OpenBSD: exec.c,v 1.9 2016/09/24 13:40:12 kettenis Exp $ */
/*
* Copyright (c) 2006, 2016 Mark Kettenis
@@ -82,7 +82,7 @@ run_loadfile(u_long *marks, int howto)
efi_cleanup();
- (*(startfuncp)(marks[MARK_ENTRY]))(NULL, (void *)board_id, fdt);
+ (*(startfuncp)(marks[MARK_ENTRY]))((void *)esym, (void *)board_id, fdt);
/* NOTREACHED */
}