Gerd Hoffmann (kraxel@redhat.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11502
-gerrit
commit 13ea015c5de23ac511c75855c145b1b043c1628c Author: Gerd Hoffmann kraxel@redhat.com Date: Fri Sep 4 12:58:00 2015 +0200
qemu: fix vga driver build
Commit "7dbf9c6 edid: Use edid_mode struct to reduce redundancy" moved some fields from "struct edid" to "struct edid_mode". Adapt the bochs and cirrus drivers to that change.
Change-Id: I9ec82a403d0264955d4b72496219036c7775c758 Signed-off-by: Gerd Hoffmann kraxel@redhat.com --- src/drivers/emulation/qemu/bochs.c | 4 ++-- src/drivers/emulation/qemu/cirrus.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c index cb0075a..ae2975d 100644 --- a/src/drivers/emulation/qemu/bochs.c +++ b/src/drivers/emulation/qemu/bochs.c @@ -109,8 +109,8 @@ static void bochs_init(struct device *dev) outb(0x20, 0x3c0); /* disable blanking */
/* setup coreboot framebuffer */ - edid.ha = width; - edid.va = height; + edid.mode.ha = width; + edid.mode.va = height; edid.x_resolution = width; edid.y_resolution = height; edid.bytes_per_line = width * 4; diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c index ffc9772..be8afdf 100644 --- a/src/drivers/emulation/qemu/cirrus.c +++ b/src/drivers/emulation/qemu/cirrus.c @@ -332,8 +332,8 @@ static void cirrus_init(struct device *dev)
struct edid edid; - edid.ha = width; - edid.va = height; + edid.mode.ha = width; + edid.mode.va = height; edid.x_resolution = width; edid.y_resolution = height; edid.bytes_per_line = width * 4;