From: Simon Glass <sjg@chromium.org>
Date: Tue, 4 Aug 2015 18:34:04 +0000 (-0600)
Subject: x86: Gracefully disable the vesa driver when running from EFI
X-Git-Tag: KARO-TXSD-2017-03-15~3982^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad11dbff741ffa6587f6f06a13872ffc3cc15846;p=karo-tx-uboot.git

x86: Gracefully disable the vesa driver when running from EFI

We cannot use this driver when running from EFI as we have no direct hardware
access. In fact coreboot uses a different driver which uses tables provided
by coreboot. So far it does not seem possible to use a normal video driver
when booting from EFI.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/drivers/video/vesa_fb.c b/drivers/video/vesa_fb.c
index 909f8e8091..4e6d070a5f 100644
--- a/drivers/video/vesa_fb.c
+++ b/drivers/video/vesa_fb.c
@@ -24,6 +24,14 @@ void *video_hw_init(void)
 	int ret;
 
 	printf("Video: ");
+	if (!ll_boot_init()) {
+		/*
+		 * If we are running from EFI or coreboot, this driver can't
+		 * work.
+		 */
+		printf("Not available (previous bootloader prevents it)\n");
+		return NULL;
+	}
 	if (vbe_get_video_info(gdev)) {
 		dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, 0);
 		if (dev == -1) {