Merge pull request 'u-boot: qemu_arm64_12mb: Enable video console' (#142) from alpernebbi/lbmk:uboot-qemu-arm64-video into master

Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/142

1 files changed, 104 insertions, 11 deletions

diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/u-boot/qemu_arm64_12mb/config/default
index 982b6889..83c90261 100644
--- a/config/u-boot/qemu_arm64_12mb/config/default
+++ b/config/u-boot/qemu_arm64_12mb/config/default
@@ -188,6 +188,8 @@ CONFIG_SYS_MONITOR_LEN=0
 # CONFIG_TARGET_QEMU_ARM_32BIT is not set
 CONFIG_TARGET_QEMU_ARM_64BIT=y
 CONFIG_ERR_PTR_OFFSET=0x0
+CONFIG_PRE_CON_BUF_ADDR=0x40100000
+CONFIG_PRE_CON_BUF_SZ=4096
 CONFIG_BOOTSTAGE_STASH_ADDR=0
 CONFIG_DEBUG_UART_BASE=0x9000000
 CONFIG_DEBUG_UART_CLOCK=0
@@ -311,6 +313,7 @@ CONFIG_BOOTMETH_DISTRO=y
 CONFIG_BOOTMETH_VBE_REQUEST=y
 CONFIG_BOOTMETH_VBE_SIMPLE=y
 CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
+CONFIG_EXPO=y
 CONFIG_BOOTMETH_SCRIPT=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
@@ -364,7 +367,8 @@ CONFIG_BOOTDELAY=2
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="bootflow scan -lb"
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT=""
+CONFIG_PREBOOT="usb start"
+CONFIG_PREBOOT_DEFINED=y
 CONFIG_DEFAULT_FDT_FILE=""
 # CONFIG_SAVE_PREV_BL_FDT_ADDR is not set
 # CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR is not set
@@ -384,15 +388,16 @@ CONFIG_LOGLEVEL=4
 # CONFIG_SILENT_CONSOLE is not set
 # CONFIG_SPL_SILENT_CONSOLE is not set
 # CONFIG_TPL_SILENT_CONSOLE is not set
-# CONFIG_PRE_CONSOLE_BUFFER is not set
+CONFIG_PRE_CONSOLE_BUFFER=y
 CONFIG_CONSOLE_FLUSH_SUPPORT=y
-# CONFIG_CONSOLE_MUX is not set
-# CONFIG_SYS_CONSOLE_IS_IN_ENV is not set
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
+# CONFIG_SYS_CONSOLE_ENV_OVERWRITE is not set
 # CONFIG_SYS_CONSOLE_INFO_QUIET is not set
-# CONFIG_SYS_STDIO_DEREGISTER is not set
+CONFIG_SYS_STDIO_DEREGISTER=y
 # CONFIG_SPL_SYS_STDIO_DEREGISTER is not set
-# CONFIG_SYS_DEVICE_NULLDEV is not set
+CONFIG_SYS_DEVICE_NULLDEV=y
 
 #
 # Logging
@@ -669,11 +674,12 @@ CONFIG_CMD_PXE=y
 # Misc commands
 #
 # CONFIG_CMD_2048 is not set
+# CONFIG_CMD_BMP is not set
 # CONFIG_CMD_BSP is not set
 CONFIG_CMD_BLOCK_CACHE=y
 # CONFIG_CMD_CACHE is not set
 # CONFIG_CMD_CONITRACE is not set
-# CONFIG_CMD_CLS is not set
+CONFIG_CMD_CLS=y
 # CONFIG_CMD_EFIDEBUG is not set
 CONFIG_CMD_EFICONFIG=y
 # CONFIG_CMD_EXCEPTION is not set
@@ -692,6 +698,8 @@ CONFIG_CMD_QFW=y
 # CONFIG_CMD_PSTORE is not set
 # CONFIG_CMD_TERMINAL is not set
 # CONFIG_CMD_UUID is not set
+CONFIG_CMD_VIDCONSOLE=y
+# CONFIG_CMD_SELECT_FONT is not set
 
 #
 # TI specific command line interface
@@ -1023,8 +1031,10 @@ CONFIG_I2C=y
 # CONFIG_SYS_I2C_MV is not set
 # CONFIG_SYS_I2C_MVTWSI is not set
 CONFIG_INPUT=y
-# CONFIG_DM_KEYBOARD is not set
+CONFIG_DM_KEYBOARD=y
+# CONFIG_BUTTON_KEYBOARD is not set
 # CONFIG_CROS_EC_KEYB is not set
+# CONFIG_I8042_KEYB is not set
 # CONFIG_TEGRA_KEYBOARD is not set
 # CONFIG_TWL4030_INPUT is not set
 
@@ -1413,7 +1423,12 @@ CONFIG_DM_USB=y
 # USB Host Controller Drivers
 #
 CONFIG_USB_HOST=y
-# CONFIG_USB_XHCI_HCD is not set
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DWC3 is not set
+# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
+CONFIG_USB_XHCI_PCI=y
+# CONFIG_USB_XHCI_FSL is not set
+# CONFIG_USB_XHCI_BRCM is not set
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_MSM is not set
 CONFIG_USB_EHCI_PCI=y
@@ -1425,6 +1440,8 @@ CONFIG_USB_EHCI_PCI=y
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_ISP1760 is not set
+# CONFIG_USB_CDNS3 is not set
+# CONFIG_USB_DWC3 is not set
 
 #
 # Legacy MUSB Support
@@ -1452,9 +1469,13 @@ CONFIG_USB_EHCI_PCI=y
 # USB peripherals
 #
 CONFIG_USB_STORAGE=y
-# CONFIG_USB_KEYBOARD is not set
+CONFIG_USB_KEYBOARD=y
 # CONFIG_USB_ONBOARD_HUB is not set
 CONFIG_USB_HUB_DEBOUNCE_TIMEOUT=1000
+CONFIG_USB_KEYBOARD_FN_KEYS=y
+CONFIG_SYS_USB_EVENT_POLL=y
+# CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE is not set
+# CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP is not set
 # CONFIG_USB_HOST_ETHER is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_SPL_USB_GADGET is not set
@@ -1468,7 +1489,79 @@ CONFIG_USB_HUB_DEBOUNCE_TIMEOUT=1000
 #
 # Graphics support
 #
-# CONFIG_VIDEO is not set
+CONFIG_VIDEO=y
+# CONFIG_VIDEO_FONT_4X6 is not set
+CONFIG_VIDEO_FONT_8X16=y
+# CONFIG_VIDEO_FONT_SUN12X22 is not set
+# CONFIG_VIDEO_FONT_16X32 is not set
+CONFIG_VIDEO_LOGO=y
+CONFIG_BACKLIGHT=y
+CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0x800000
+# CONFIG_VIDEO_COPY is not set
+# CONFIG_VIDEO_DAMAGE is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+CONFIG_VIDEO_BPP8=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_VIDEO_ANSI=y
+# CONFIG_VIDEO_MIPI_DSI is not set
+CONFIG_CONSOLE_NORMAL=y
+# CONFIG_CONSOLE_ROTATION is not set
+# CONFIG_CONSOLE_TRUETYPE is not set
+CONFIG_SYS_WHITE_ON_BLACK=y
+# CONFIG_NO_FB_CLEAR is not set
+CONFIG_PANEL=y
+# CONFIG_PANEL_HX8238D is not set
+
+#
+# TrueType Fonts
+#
+# CONFIG_VIDCONSOLE_AS_LCD is not set
+CONFIG_VIDEO_BOCHS=y
+CONFIG_VIDEO_BOCHS_SIZE_X=1280
+CONFIG_VIDEO_BOCHS_SIZE_Y=1024
+# CONFIG_VIDEO_VESA is not set
+# CONFIG_VIDEO_LCD_ANX9804 is not set
+# CONFIG_ATMEL_LCD_BGR555 is not set
+# CONFIG_VIDEO_BCM2835 is not set
+# CONFIG_VIDEO_LCD_ENDEAVORU is not set
+# CONFIG_VIDEO_LCD_HIMAX_HX8394 is not set
+# CONFIG_VIDEO_LCD_ORISETECH_OTM8009A is not set
+# CONFIG_VIDEO_LCD_RAYDIUM_RM68200 is not set
+# CONFIG_VIDEO_LCD_RENESAS_R61307 is not set
+# CONFIG_VIDEO_LCD_RENESAS_R69328 is not set
+# CONFIG_VIDEO_LCD_SSD2828 is not set
+# CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set
+# CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set
+# CONFIG_VIDEO_MESON is not set
+# CONFIG_VIDEO_MVEBU is not set
+# CONFIG_I2C_EDID is not set
+# CONFIG_DISPLAY is not set
+# CONFIG_ATMEL_HLCD is not set
+# CONFIG_BACKLIGHT_LM3533 is not set
+# CONFIG_AM335X_LCD is not set
+# CONFIG_VIDEO_EXYNOS is not set
+# CONFIG_VIDEO_ROCKCHIP is not set
+# CONFIG_VIDEO_ARM_MALIDP is not set
+# CONFIG_VIDEO_STM32 is not set
+# CONFIG_VIDEO_TIDSS is not set
+# CONFIG_VIDEO_TEGRA124 is not set
+# CONFIG_VIDEO_BRIDGE is not set
+# CONFIG_VIDEO_TEGRA20 is not set
+# CONFIG_TEGRA_BACKLIGHT_PWM is not set
+# CONFIG_VIDEO_MXS is not set
+CONFIG_CONSOLE_SCROLL_LINES=1
+# CONFIG_VIDEO_SIMPLE is not set
+# CONFIG_VIDEO_DT_SIMPLEFB is not set
+# CONFIG_VIDEO_MCDE_SIMPLE is not set
+# CONFIG_OSD is not set
+# CONFIG_VIDEO_REMOVE is not set
+# CONFIG_SPLASH_SCREEN is not set
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x100000
+CONFIG_VIDEO_BMP_RLE8=y
+# CONFIG_BMP_16BPP is not set
+# CONFIG_BMP_24BPP is not set
+# CONFIG_BMP_32BPP is not set
 
 #
 # VirtIO Drivers