diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-09 09:54:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-09 09:54:22 -0400 |
| commit | 506d52308a2f5de48c2b9a08229fee9a0ee2842a (patch) | |
| tree | d0d96d1fac8c0912155941f8b684f8654ce27d50 /configs | |
| parent | d9107930af63d88c2d84560db19e65f1a51c4cbd (diff) | |
| parent | db17e40ccab6526a9db6ffdd071182a37dd888eb (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Add two- and three-argument versions of CONFIG_IS_ENABLED in
linux/kconfig.h
- Adds a new feature which supports copying modified parts of
the frame buffer to the uncached hardware buffer
- Enable the copy framebuffer on various x86 targets
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/chromebook_link_defconfig | 2 | ||||
| -rw-r--r-- | configs/chromebook_samus_defconfig | 2 | ||||
| -rw-r--r-- | configs/minnowmax_defconfig | 4 | ||||
| -rw-r--r-- | configs/sandbox_defconfig | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 3d51ec9606..7e9a7a3cc3 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -62,10 +62,10 @@ CONFIG_SPI=y CONFIG_TPM_TIS_LPC=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y +CONFIG_VIDEO_COPY=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_VIDEO_IVYBRIDGE_IGD=y -CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y # CONFIG_GZIP is not set diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index c18cba9cf4..bf03cdeead 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -67,8 +67,8 @@ CONFIG_SPI=y CONFIG_TPM_TIS_LPC=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y +CONFIG_VIDEO_COPY=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y -CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_TPM=y # CONFIG_GZIP is not set diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 40ed9e4120..13d6edd08c 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -59,7 +59,7 @@ CONFIG_RTL8169=y CONFIG_SPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y +CONFIG_VIDEO_COPY=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_FRAMEBUFFER_VESA_MODE_11B=y -CONFIG_CONSOLE_SCROLL_LINES=5 +CONFIG_FRAMEBUFFER_VESA_MODE_118=y # CONFIG_GZIP is not set diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index e0dffa36ea..9b74e404bb 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -220,6 +220,7 @@ CONFIG_DM_USB=y CONFIG_USB_EMUL=y CONFIG_USB_KEYBOARD=y CONFIG_DM_VIDEO=y +CONFIG_VIDEO_COPY=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y |