summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2021-01-19 05:41:44 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-01-19 05:41:44 +0100
commitb5d3c4c00dff9211fb271e644ae5e98aa0a0853e (patch)
tree8f9d871b2a51b27ad345bece85ce59ee4e8d6c52 /arch
parent2ea982543a2570af2f7629e08bb6d3ff28b07e3a (diff)
parentaa3cdd7c55bfcbbc2da56220a809b5ac39ac3346 (diff)
downloadbarebox-b5d3c4c00dff9211fb271e644ae5e98aa0a0853e.tar.gz
barebox-b5d3c4c00dff9211fb271e644ae5e98aa0a0853e.tar.xz
Merge branch 'for-next/video'
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/configs/qemu-malta_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/configs/qemu-malta_defconfig b/arch/mips/configs/qemu-malta_defconfig
index ac0577c217..b9994f392c 100644
--- a/arch/mips/configs/qemu-malta_defconfig
+++ b/arch/mips/configs/qemu-malta_defconfig
@@ -42,6 +42,7 @@ CONFIG_CMD_LOGIN=y
CONFIG_CMD_MENU=y
CONFIG_CMD_MENU_MANAGEMENT=y
CONFIG_CMD_PASSWD=y
+CONFIG_CMD_FBTEST=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_CRC=y
@@ -68,6 +69,9 @@ CONFIG_DRIVER_CFI=y
# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set
# CONFIG_DRIVER_CFI_BANK_WIDTH_2 is not set
CONFIG_CFI_BUFFER_WRITE=y
+CONFIG_VIDEO=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_DRIVER_VIDEO_BOCHS_PCI=y
CONFIG_GPIO_MALTA_FPGA_I2C=y
CONFIG_PCI=y
CONFIG_PCI_DEBUG=y