aboutsummaryrefslogtreecommitdiffstats
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 13:25:14 +0000
commit5e6693103f89d872fc4c12b609dbece619b37361 (patch)
treeed5a25f88e694f32dbe0638505e96b671e4efc81
parentac720207aad6081543d9f9f4731d17e6f8911219 (diff)
downloadsyslinux-for-aboie/elflink/firmware.tar.gz
syslinux-for-aboie/elflink/firmware.tar.xz
syslinux-for-aboie/elflink/firmware.zip
vesa: Make __vesacon_i915resolution() a stub under EFIfor-aboie/elflink/firmware
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>
-rw-r--r--com32/lib/Makefile8
-rw-r--r--efi/vesa.c6
2 files changed, 13 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
diff --git a/efi/vesa.c b/efi/vesa.c
index 4d75559a..e04bbc68 100644
--- a/efi/vesa.c
+++ b/efi/vesa.c
@@ -304,6 +304,12 @@ static int efi_vesacon_font_query(uint8_t **font)
return cp865_8x16_font_height;
}
+int __vesacon_i915resolution(int x, int y)
+{
+ /* We don't support this function */
+ return 1;
+}
+
struct vesa_ops efi_vesa_ops = {
.set_mode = efi_vesacon_set_mode,
.screencpy = efi_vesacon_screencpy,