diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-01-26 12:57:11 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-02-02 16:11:32 +0000 |
| commit | 13aff40f7b7a9644568c6144c3893c77d62492bd (patch) | |
| tree | 994dd0a0e904859659e5cfebfe6a2e9d301729e8 | |
| parent | edcfbdfdfcdcc62a46c8d4be50434486b0f6c0f7 (diff) | |
| download | syslinux-13aff40f7b7a9644568c6144c3893c77d62492bd.tar.gz syslinux-13aff40f7b7a9644568c6144c3893c77d62492bd.tar.xz syslinux-13aff40f7b7a9644568c6144c3893c77d62492bd.zip | |
firmware: Move firmware code into core/bios.c
The EFI application really shouldn't be including code for the BIOS
firmware implementation, so move it to core/bios.c and explicitly
ignore core/bios.o when building the EFI application.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | core/bios.c (renamed from com32/lib/syslinux/firmware.c) | 3 | ||||
| -rw-r--r-- | efi/Makefile | 2 | ||||
| -rw-r--r-- | mk/lib.mk | 2 |
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) @@ -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 = \ |