aboutsummaryrefslogtreecommitdiffstats
path: root/mk
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-15 12:00:30 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-15 13:06:48 +0000
commit813388b889a38d756ce2709148244ba7cb354003 (patch)
treebaf08f5889229989ff66e6c4717473d88236aff5 /mk
parentd87b69dccdf1a42942c277ca6b074a69b95d87c4 (diff)
downloadsyslinux-813388b889a38d756ce2709148244ba7cb354003.tar.gz
syslinux-813388b889a38d756ce2709148244ba7cb354003.tar.xz
syslinux-813388b889a38d756ce2709148244ba7cb354003.zip
firmware: Make disk->private an opaque type
We've currently got both the BIOS and EFI versions of struct disk_private in core/include/disk.h, which isn't ideal because this file shouldn't need to know about the inner-workings of the firmware's private disk info. Move the implementation of 'struct disk_private' into more suitable locations and use a void * for the 'private' member of struct disk. This change allows us to once and for all delete the gnu-efi header files from core/include/core.h and the gnu-efi include paths from mk/lib.mk. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/lib.mk11
1 files changed, 0 insertions, 11 deletions
diff --git a/mk/lib.mk b/mk/lib.mk
index fc7eba11..499a13b6 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -52,17 +52,6 @@ OPTFLAGS = -Os -march=$(MARCH) -falign-functions=0 -falign-jumps=0 \
-falign-labels=0 -ffast-math -fomit-frame-pointer
WARNFLAGS = $(GCCWARN) -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline
-ifdef EFI_BUILD
-#Add console read fixes to rawcon_read.c
-LIBFLAGS += -DSYSLINUX_EFI -DEFI_FUNCTION_WRAPPER
-ifeq ($(ARCH),i386)
- EFIINC = -I/usr/local/include/efi -I/usr/local/include/efi/ia32
-endif
-ifeq ($(ARCH),x86_64)
- EFIINC = -I/usr/include/efi -I/usr/include/efi/x86_64
-endif
-REQFLAGS += $(EFIINC)
-endif
CFLAGS = $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS)
VPATH = $(SRC)