mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
Revert "x86: Switch QEMU over to use the bochs driver"
Unfortunately the bochs driver does not currently work with distros.
It causes a hang between grub menu selection and the OS displaying
something.
Preliminary investigation shows that GRUB does not jump to the kernel
at all.
This reproduces reliably.
This reverts commit b8956425d5
.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com> # qemu-x86_64
[Slightly modify the commit message about preliminary investigation]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
ea6eef27ca
commit
1fa64e155d
3 changed files with 8 additions and 1 deletions
|
@ -12,7 +12,7 @@ config QEMU
|
||||||
imply SYS_NS16550
|
imply SYS_NS16550
|
||||||
imply USB
|
imply USB
|
||||||
imply USB_EHCI_HCD
|
imply USB_EHCI_HCD
|
||||||
imply VIDEO_BOCHS
|
imply VIDEO_VESA
|
||||||
|
|
||||||
if QEMU
|
if QEMU
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,10 @@ CONFIG_SPL_DM_RTC=y
|
||||||
CONFIG_SYS_NS16550_PORT_MAPPED=y
|
CONFIG_SYS_NS16550_PORT_MAPPED=y
|
||||||
CONFIG_SPI=y
|
CONFIG_SPI=y
|
||||||
CONFIG_USB_KEYBOARD=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_CONSOLE_SCROLL_LINES=5
|
||||||
# CONFIG_SPL_USE_TINY_PRINTF is not set
|
# CONFIG_SPL_USE_TINY_PRINTF is not set
|
||||||
CONFIG_GENERATE_ACPI_TABLE=y
|
CONFIG_GENERATE_ACPI_TABLE=y
|
||||||
|
|
|
@ -53,6 +53,9 @@ CONFIG_NVME_PCI=y
|
||||||
CONFIG_SYS_NS16550_PORT_MAPPED=y
|
CONFIG_SYS_NS16550_PORT_MAPPED=y
|
||||||
CONFIG_SPI=y
|
CONFIG_SPI=y
|
||||||
CONFIG_USB_KEYBOARD=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_CONSOLE_SCROLL_LINES=5
|
||||||
CONFIG_GENERATE_ACPI_TABLE=y
|
CONFIG_GENERATE_ACPI_TABLE=y
|
||||||
# CONFIG_GZIP is not set
|
# CONFIG_GZIP is not set
|
||||||
|
|
Loading…
Reference in a new issue