summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-04 12:34:04 -0600
committerSimon Glass <sjg@chromium.org>2015-08-05 08:44:08 -0600
commitad11dbff741ffa6587f6f06a13872ffc3cc15846 (patch)
treec02465425a1921926cb4badbe4f64de5c65f3c29 /drivers/video
parenteeae5100071465f67d203dd78ceb5a35de1b5717 (diff)
downloadtalos-obmc-uboot-ad11dbff741ffa6587f6f06a13872ffc3cc15846.tar.gz
talos-obmc-uboot-ad11dbff741ffa6587f6f06a13872ffc3cc15846.zip
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/vesa_fb.c8
1 files changed, 8 insertions, 0 deletions
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) {
OpenPOWER on IntegriCloud