aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-08 13:19:36 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-08 15:49:02 +0000
commit7eda4ce3c7ad2b3ea4ab104e007b3be30b33e4cf (patch)
tree62fe6c183620b571e0579dc28d6f6132e307081b /com32
parent8789d2689564c13754bac94c8309b0de1e34a42a (diff)
downloadsyslinux-7eda4ce3c7ad2b3ea4ab104e007b3be30b33e4cf.tar.gz
syslinux-7eda4ce3c7ad2b3ea4ab104e007b3be30b33e4cf.tar.xz
syslinux-7eda4ce3c7ad2b3ea4ab104e007b3be30b33e4cf.zip
vesa: Make __vesacon_i915resolution() a stub under EFI
We can't use the code in __vesacon_i915resolution() under EFI, it leads to hangs. Provide a stub implementation in efi/vesa.c that just returns an error. We don't use the usual idiom of moving the function into the 'firmware' structure because that would require the i915 code to move into the core/. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32')
-rw-r--r--com32/lib/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index 95564b9c..f83e8179 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -22,11 +22,17 @@ LIBJPG_OBJS = \
jpeg/rgb24.o jpeg/bgr24.o jpeg/yuv420p.o jpeg/grey.o \
jpeg/rgba32.o jpeg/bgra32.o
+ifdef EFI_BUILD
+I915VESA_OBJ =
+else
+I915VESA_OBJ = sys/vesa/i915resolution.o
+endif
+
LIBVESA_OBJS = \
sys/vesacon_write.o sys/vesaserial_write.o \
sys/vesa/initvesa.o sys/vesa/drawtxt.o sys/vesa/background.o \
sys/vesa/alphatbl.o sys/vesa/screencpy.o sys/vesa/fmtpixel.o \
- sys/vesa/i915resolution.o
+ $(I915VESA_OBJ)
LIBMISC_OBJS = \
sys/libansi.o sys/gpxe.o