aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 473d3a55..87308fd5 100644
--- a/efi/vesa.c
+++ b/efi/vesa.c
@@ -299,6 +299,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,