diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-16 13:24:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-16 13:24:20 -0400 |
| commit | 9d24b01ce0e938b49270386467e3edd4476e9108 (patch) | |
| tree | 6cc85d250cee64440ffc6dedc47aa5b626fd2c88 /configs | |
| parent | 282f15804b45d3dd42f31fbbce090aaaa579db6c (diff) | |
| parent | d5032392babd3a8bd027ccb79072ee7b05299b67 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/bayleybay_defconfig | 2 | ||||
| -rw-r--r-- | configs/coreboot_defconfig (renamed from configs/coreboot-x86_defconfig) | 0 | ||||
| -rw-r--r-- | configs/minnowmax_defconfig | 2 | ||||
| -rw-r--r-- | configs/qemu-x86_64_defconfig | 2 | ||||
| -rw-r--r-- | configs/qemu-x86_defconfig | 2 | ||||
| -rw-r--r-- | configs/qemu-x86_efi_payload32_defconfig | 2 | ||||
| -rw-r--r-- | configs/qemu-x86_efi_payload64_defconfig | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 5f7a09dffd..c78a70db1a 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -52,5 +52,5 @@ CONFIG_E1000=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_FRAMEBUFFER_VESA_MODE_11B=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot_defconfig index ecedc8b4c5..ecedc8b4c5 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot_defconfig diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 35477131a6..627f1d8ee2 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -57,5 +57,5 @@ CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_FRAMEBUFFER_VESA_MODE_11B=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 10bbc76a53..3aae96f92e 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -69,5 +69,5 @@ CONFIG_SPL_TIMER=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_FRAMEBUFFER_VESA_MODE_112=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 311fae3360..28ee4aa963 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -49,5 +49,5 @@ CONFIG_NVME=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_FRAMEBUFFER_VESA_MODE_112=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index d2fc5462c8..b8476092cf 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -43,7 +43,7 @@ CONFIG_CPU=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_FRAMEBUFFER_VESA_MODE_112=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_EFI=y CONFIG_EFI_STUB=y diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index 9fd563ed34..59ff2a0761 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -43,7 +43,7 @@ CONFIG_CPU=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_FRAMEBUFFER_VESA_MODE_112=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_EFI=y CONFIG_EFI_STUB=y |