aboutsummaryrefslogtreecommitdiff
path: root/sys/boot
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>2001-09-14 08:27:49 +0000
committerDoug Rabson <dfr@FreeBSD.org>2001-09-14 08:27:49 +0000
commit327b34100f6c943863e360f2447970043613f65b (patch)
treef9fd56d7e0a3d70c06b3377a4260ac1f49ecaf45 /sys/boot
parentf19fa0b62725d51e25a148eeb43f8c6e25eaf13d (diff)
Notes
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/efi/libefi/Makefile2
-rw-r--r--sys/boot/efi/libefi/elf_freebsd.c8
-rw-r--r--sys/boot/ia64/common/exec.c8
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index 7e537147cf8c..7d1a462f6748 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -7,7 +7,7 @@ INTERNALLIB= true
INTERNALSTATICLIB= true
SRCS= libefi.c efi_console.c time.c copy.c devicename.c module.c exit.c
-SRCS+= delay.c efifs.c
+SRCS+= delay.c efifs.c elf_freebsd.c
CFLAGS+= -fpic
CFLAGS+= -I${.CURDIR}/../include
diff --git a/sys/boot/efi/libefi/elf_freebsd.c b/sys/boot/efi/libefi/elf_freebsd.c
index 994a78714bbf..9814d4b809a0 100644
--- a/sys/boot/efi/libefi/elf_freebsd.c
+++ b/sys/boot/efi/libefi/elf_freebsd.c
@@ -82,8 +82,6 @@
#include <sys/param.h>
#include <sys/linker.h>
#include <machine/elf.h>
-#include <machine/prom.h>
-#include <machine/rpb.h>
#include <machine/bootinfo.h>
#include "bootstrap.h"
@@ -91,12 +89,8 @@
#define _KERNEL
static int elf_exec(struct preloaded_file *amp);
-int bi_load(struct bootinfo_v1 *, vm_offset_t *,
- struct preloaded_file *);
-struct file_format alpha_elf = { elf_loadfile, elf_exec };
-
-vm_offset_t ffp_save, ptbr_save;
+struct file_format ia64_elf = { elf_loadfile, elf_exec };
static int
elf_exec(struct preloaded_file *fp)
diff --git a/sys/boot/ia64/common/exec.c b/sys/boot/ia64/common/exec.c
index 994a78714bbf..9814d4b809a0 100644
--- a/sys/boot/ia64/common/exec.c
+++ b/sys/boot/ia64/common/exec.c
@@ -82,8 +82,6 @@
#include <sys/param.h>
#include <sys/linker.h>
#include <machine/elf.h>
-#include <machine/prom.h>
-#include <machine/rpb.h>
#include <machine/bootinfo.h>
#include "bootstrap.h"
@@ -91,12 +89,8 @@
#define _KERNEL
static int elf_exec(struct preloaded_file *amp);
-int bi_load(struct bootinfo_v1 *, vm_offset_t *,
- struct preloaded_file *);
-struct file_format alpha_elf = { elf_loadfile, elf_exec };
-
-vm_offset_t ffp_save, ptbr_save;
+struct file_format ia64_elf = { elf_loadfile, elf_exec };
static int
elf_exec(struct preloaded_file *fp)