Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/82060?usp=email )
Change subject: drivers/qemu: Clarify config option name for QEMU display resolution ......................................................................
drivers/qemu: Clarify config option name for QEMU display resolution
A previous commit splits out Cirrus display support from Bochs display support, with both using the pre-existing Bochs config options for the requested display resolution. Rename these config names to clarify they are not only specific to the Bochs display driver.
Change-Id: Ie0a5e75731231bb768d7728867196c9ab5c53a00 Signed-off-by: Alper Nebi Yasak alpernebiyasak@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/82060 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de --- M src/drivers/emulation/qemu/Kconfig M src/drivers/emulation/qemu/bochs.c M src/drivers/emulation/qemu/cirrus.c 3 files changed, 8 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/src/drivers/emulation/qemu/Kconfig b/src/drivers/emulation/qemu/Kconfig index 0a1a078..5b01ae7 100644 --- a/src/drivers/emulation/qemu/Kconfig +++ b/src/drivers/emulation/qemu/Kconfig @@ -24,14 +24,14 @@ help VGA driver for qemu emulated cirrus svga card.
-config DRIVERS_EMULATION_QEMU_BOCHS_XRES - int "bochs vga xres" +config DRIVERS_EMULATION_QEMU_XRES + int "qemu vga xres" default 800 depends on LINEAR_FRAMEBUFFER depends on DRIVERS_EMULATION_QEMU_BOCHS || DRIVERS_EMULATION_QEMU_CIRRUS
-config DRIVERS_EMULATION_QEMU_BOCHS_YRES - int "bochs vga yres" +config DRIVERS_EMULATION_QEMU_YRES + int "qemu vga yres" default 600 depends on LINEAR_FRAMEBUFFER depends on DRIVERS_EMULATION_QEMU_BOCHS || DRIVERS_EMULATION_QEMU_CIRRUS diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c index 0650430..2e0526f 100644 --- a/src/drivers/emulation/qemu/bochs.c +++ b/src/drivers/emulation/qemu/bochs.c @@ -39,8 +39,8 @@ #define VBE_DISPI_LFB_ENABLED 0x40 #define VBE_DISPI_NOCLEARMEM 0x80
-static int width = CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES; -static int height = CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES; +static int width = CONFIG_DRIVERS_EMULATION_QEMU_XRES; +static int height = CONFIG_DRIVERS_EMULATION_QEMU_YRES;
static void bochs_write(struct resource *res, int index, int val) { diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c index 1dc8ac9..6fa9ac2 100644 --- a/src/drivers/emulation/qemu/cirrus.c +++ b/src/drivers/emulation/qemu/cirrus.c @@ -9,8 +9,8 @@ #include <pc80/vga_io.h> #include <framebuffer_info.h>
-static int width = CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES; -static int height = CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES; +static int width = CONFIG_DRIVERS_EMULATION_QEMU_XRES; +static int height = CONFIG_DRIVERS_EMULATION_QEMU_YRES; static u32 addr = 0;
enum