aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/bios.c (renamed from com32/lib/syslinux/firmware.c)3
-rw-r--r--efi/Makefile2
-rw-r--r--mk/lib.mk2
3 files changed, 4 insertions, 3 deletions
diff --git a/com32/lib/syslinux/firmware.c b/core/bios.c
index f5765b6c..6aaf8c49 100644
--- a/com32/lib/syslinux/firmware.c
+++ b/core/bios.c
@@ -1,10 +1,11 @@
#include <sys/io.h>
#include <fs.h>
-#include <syslinux/memscan.h>
#include <bios.h>
+#include <syslinux/memscan.h>
#include <syslinux/firmware.h>
struct firmware *firmware = NULL;
+
extern struct ansi_ops bios_ansi_ops;
extern void bios_erase(int, int, int, int, uint8_t);
diff --git a/efi/Makefile b/efi/Makefile
index 294d8556..39b99eff 100644
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -20,7 +20,7 @@ CORE_COBJ := $(patsubst %.c,%.o,$(CORE_CSRC))
# Don't include console objects
CORE_OBJS = $(filter-out $(core)/hello.o $(core)/rawcon.o \
- $(core)/plaincon.o $(core)/strcasecmp.o,$(CORE_COBJ))
+ $(core)/plaincon.o $(core)/strcasecmp.o $(core)/bios.o,$(CORE_COBJ))
LIB_OBJS = $(addprefix $(com32)/lib/,$(MINLIBOBJS))
CSRC = $(wildcard *.c)
diff --git a/mk/lib.mk b/mk/lib.mk
index 24b8d557..7ef51043 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -98,7 +98,7 @@ LIBOTHER_OBJS = \
\
sys/x86_init_fpu.o math/pow.o math/strtod.o \
\
- syslinux/memscan.o syslinux/firmware.o
+ syslinux/memscan.o
## CORE OBJECTS, INCLUDED IN THE ROOT COM32 MODULE
LIBENTRY_OBJS = \