[syslinux:firmware] firmware: Move firmware code into core/bios.c

[syslinux-bot for Matt Fleming]

Commit-ID:  13aff40f7b7a9644568c6144c3893c77d62492bd
Gitweb:     http://www.syslinux.org/commit/13aff40f7b7a9644568c6144c3893c77d62492bd
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Thu, 26 Jan 2012 12:57:11 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Thu, 2 Feb 2012 16:11:32 +0000

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 at intel.com>

---
 com32/lib/syslinux/firmware.c => core/bios.c |    3 ++-
 efi/Makefile                                 |    2 +-
 mk/lib.mk                                    |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/com32/lib/syslinux/firmware.c b/core/bios.c
similarity index 99%
rename from com32/lib/syslinux/firmware.c
rename to core/bios.c
index f5765b6..6aaf8c4 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 294d855..39b99ef 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 24b8d55..7ef5104 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 = \