diff mbox series

[2/2] x86: Switch QEMU over to use the bochs driver

Message ID 20230430023157.1051841-2-sjg@chromium.org
State Superseded
Delegated to: Bin Meng
Headers show
Series [1/2] x86: video: Add a driver for QEMU bochs emulation | expand

Commit Message

Simon Glass April 30, 2023, 2:31 a.m. UTC
This is more convenient since it does not require a video BIOS. Enable
it for QEMU.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/x86/cpu/qemu/Kconfig     | 2 +-
 configs/qemu-x86_64_defconfig | 5 +----
 configs/qemu-x86_defconfig    | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

Comments

Heinrich Schuchardt April 30, 2023, 2:38 a.m. UTC | #1
Am 30. April 2023 04:31:57 MESZ schrieb Simon Glass <sjg@chromium.org>:
>This is more convenient since it does not require a video BIOS. Enable
>it for QEMU.

Does this require a change in how QEMU is invoked? If so, please add a documentation change.

Best regards

Heinrich


>
>Signed-off-by: Simon Glass <sjg@chromium.org>
>---
>
> arch/x86/cpu/qemu/Kconfig     | 2 +-
> configs/qemu-x86_64_defconfig | 5 +----
> configs/qemu-x86_defconfig    | 3 ---
> 3 files changed, 2 insertions(+), 8 deletions(-)
>
>diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig
>index f8f2f6473088..aa329b0dab29 100644
>--- a/arch/x86/cpu/qemu/Kconfig
>+++ b/arch/x86/cpu/qemu/Kconfig
>@@ -12,7 +12,7 @@ config QEMU
> 	imply SYS_NS16550
> 	imply USB
> 	imply USB_EHCI_HCD
>-	imply VIDEO_VESA
>+	imply VIDEO_BOCHS
> 
> if QEMU
> 
>diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
>index 79ea35918575..3ebc16d370fe 100644
>--- a/configs/qemu-x86_64_defconfig
>+++ b/configs/qemu-x86_64_defconfig
>@@ -84,11 +84,8 @@ CONFIG_SPL_DM_RTC=y
> CONFIG_SYS_NS16550_PORT_MAPPED=y
> CONFIG_SPI=y
> CONFIG_USB_KEYBOARD=y
>-CONFIG_SPL_VIDEO=y
>-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>-CONFIG_FRAMEBUFFER_VESA_MODE_USER=y
>-CONFIG_FRAMEBUFFER_VESA_MODE=0x144
> CONFIG_CONSOLE_SCROLL_LINES=5
>+CONFIG_SPL_VIDEO=y
> CONFIG_FAT_BLK_XLATE=y
> # CONFIG_SPL_USE_TINY_PRINTF is not set
> CONFIG_GENERATE_ACPI_TABLE=y
>diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
>index 9bf29647fe59..fcf429f77115 100644
>--- a/configs/qemu-x86_defconfig
>+++ b/configs/qemu-x86_defconfig
>@@ -54,9 +54,6 @@ CONFIG_NVME_PCI=y
> CONFIG_SYS_NS16550_PORT_MAPPED=y
> CONFIG_SPI=y
> CONFIG_USB_KEYBOARD=y
>-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>-CONFIG_FRAMEBUFFER_VESA_MODE_USER=y
>-CONFIG_FRAMEBUFFER_VESA_MODE=0x144
> CONFIG_CONSOLE_SCROLL_LINES=5
> CONFIG_GENERATE_ACPI_TABLE=y
> # CONFIG_GZIP is not set
Simon Glass May 1, 2023, 4:40 p.m. UTC | #2
Hi Heinrich,

On Sat, 29 Apr 2023 at 20:38, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
>
>
> Am 30. April 2023 04:31:57 MESZ schrieb Simon Glass <sjg@chromium.org>:
> >This is more convenient since it does not require a video BIOS. Enable
> >it for QEMU.
>
> Does this require a change in how QEMU is invoked? If so, please add a documentation change.
>

No, it seems to work fine as is.

Regards,
Simon
diff mbox series

Patch

diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig
index f8f2f6473088..aa329b0dab29 100644
--- a/arch/x86/cpu/qemu/Kconfig
+++ b/arch/x86/cpu/qemu/Kconfig
@@ -12,7 +12,7 @@  config QEMU
 	imply SYS_NS16550
 	imply USB
 	imply USB_EHCI_HCD
-	imply VIDEO_VESA
+	imply VIDEO_BOCHS
 
 if QEMU
 
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 79ea35918575..3ebc16d370fe 100644
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -84,11 +84,8 @@  CONFIG_SPL_DM_RTC=y
 CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_KEYBOARD=y
-CONFIG_SPL_VIDEO=y
-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
-CONFIG_FRAMEBUFFER_VESA_MODE_USER=y
-CONFIG_FRAMEBUFFER_VESA_MODE=0x144
 CONFIG_CONSOLE_SCROLL_LINES=5
+CONFIG_SPL_VIDEO=y
 CONFIG_FAT_BLK_XLATE=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 CONFIG_GENERATE_ACPI_TABLE=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 9bf29647fe59..fcf429f77115 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -54,9 +54,6 @@  CONFIG_NVME_PCI=y
 CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_KEYBOARD=y
-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
-CONFIG_FRAMEBUFFER_VESA_MODE_USER=y
-CONFIG_FRAMEBUFFER_VESA_MODE=0x144
 CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_GENERATE_ACPI_TABLE=y
 # CONFIG_GZIP is not set