| Message ID | 20230619120011.1587499-12-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: Use qemu-x86_64 to boot EFI installers | expand |
On Mon, Jun 19, 2023 at 8:02 PM Simon Glass <sjg@chromium.org> wrote: > > This is more convenient since it does not require a video BIOS. Enable > it for QEMU. > > Also drop use of video in SPL for the 64-bit qmeu, since it not needed > now. typo: QEMU > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v4: > - Drop use of video in SPL > - Bring in bochs patch to this series > > arch/x86/cpu/qemu/Kconfig | 2 +- > configs/qemu-x86_64_defconfig | 4 ---- > configs/qemu-x86_defconfig | 3 --- > 3 files changed, 1 insertion(+), 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..870332a1e625 100644 > --- a/configs/qemu-x86_64_defconfig > +++ b/configs/qemu-x86_64_defconfig > @@ -84,10 +84,6 @@ 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_FAT_BLK_XLATE=y > # CONFIG_SPL_USE_TINY_PRINTF is not set > 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 > -- Otherwise, Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
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..870332a1e625 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -84,10 +84,6 @@ 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_FAT_BLK_XLATE=y # CONFIG_SPL_USE_TINY_PRINTF is not set 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
This is more convenient since it does not require a video BIOS. Enable it for QEMU. Also drop use of video in SPL for the 64-bit qmeu, since it not needed now. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v4: - Drop use of video in SPL - Bring in bochs patch to this series arch/x86/cpu/qemu/Kconfig | 2 +- configs/qemu-x86_64_defconfig | 4 ---- configs/qemu-x86_defconfig | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-)