summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2014-08-27 10:42:47 +0200
committerGerd Hoffmann <kraxel@redhat.com>2014-08-28 07:50:34 +0200
commit4f62732858ef5d332c6f646c3302b5e7c0f5e436 (patch)
tree54ea15d57dfd47937a87342efe70cb579e149237
parent9135cb4542dd0e11bb672a438bd18e673e58a323 (diff)
downloadcoreboot-4f62732858ef5d332c6f646c3302b5e7c0f5e436.tar.xz
qemu: fix bochs build
commit 9518b56 (intel/gma: Clarify code and use dedicated init for Google Peppy) changed "struct edid" and thereby broke the build. Adapt drivers/emulation/qemu/bochs.c to the changes to fix this. Build failure triggers with CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y. Change-Id: Ic295c6d31284555e1463af5bca673231b8722d54 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-on: http://review.coreboot.org/6769 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/drivers/emulation/qemu/bochs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c
index 715c94c6ec..f2e4dfb2a0 100644
--- a/src/drivers/emulation/qemu/bochs.c
+++ b/src/drivers/emulation/qemu/bochs.c
@@ -114,7 +114,9 @@ static void bochs_init(device_t dev)
edid.x_resolution = width;
edid.y_resolution = height;
edid.bytes_per_line = width * 4;
- edid.bpp = 32;
+ edid.framebuffer_bits_per_pixel = 32;
+ edid.panel_bits_per_color = 8;
+ edid.panel_bits_per_pixel = 24;
set_vbe_mode_info_valid(&edid, addr);
#else
vga_misc_write(0x1);