x86: Drop the x86_fb driver

Now that we have a full VESA driver we may as well use that. We need to
support the VESA layer being set up by early start-up code or by
running a VGA ROM.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index e956835dc6d7ef39848388d3cbbc0c08ab60b22c..2f0c714e59f779e0c5743d2ffacd4d1060591cbb 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -6,6 +6,6 @@ CONFIG_OF_SEPARATE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
 CONFIG_HAVE_MRC=y
 CONFIG_SMM_TSEG_SIZE=0x800000
-CONFIG_VIDEO_X86=y
+CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 697171e413c2fa7e12d75e00ee1ab1767489cc83..51728b366f007529c2335dd929becaa30b3fcfd4 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -8,15 +8,6 @@ config VIDEO_VESA
          by U-Boot. This can in principle be used with any platform that
          supports PCI and video cards that support VESA BIOS Extension (VBE).
 
-config VIDEO_X86
-       bool "Enable x86 video driver support"
-       depends on X86
-       default n
-       help
-         Turn on this option to enable a very simple driver which uses vesa
-         to discover the video mode and then provides a frame buffer for use
-         by U-Boot.
-
 config VIDEO_LCD_SSD2828
        bool "SSD2828 bridge chip"
        default n

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 9f3c8bba17c7ed66df842c83b54f6476c688eaa5..af2d47bd75f63bde957bb4667916c1fbc64021fa 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o videomodes.o
 obj-$(CONFIG_VIDEO_TEGRA) += tegra.o
 obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
 obj-$(CONFIG_VIDEO_VESA) += vesa_fb.o
-obj-$(CONFIG_VIDEO_X86) += x86_fb.o
 obj-$(CONFIG_FORMIKE) += formike.o
 obj-$(CONFIG_AM335X_LCD) += am335x-fb.o
 obj-$(CONFIG_VIDEO_PARADE) += parade.o

diff --git a/drivers/video/x86_fb.c b/drivers/video/x86_fb.c
deleted file mode 100644 (file)
index 6641033..0000000
--- a/drivers/video/x86_fb.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Vesa frame buffer driver for x86
- *
- * Copyright (C) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <video_fb.h>
-#include <vbe.h>
-#include "videomodes.h"
-
-/*
- * The Graphic Device
- */
-GraphicDevice ctfb;
-
-void *video_hw_init(void)
-{
-       GraphicDevice *gdev = &ctfb;
-       int bits_per_pixel;
-
-       printf("Video: ");
-       if (vbe_get_video_info(gdev)) {
-               printf("No video mode configured\n");
-               return NULL;
-       }
-
-       bits_per_pixel = gdev->gdfBytesPP * 8;
-       sprintf(gdev->modeIdent, "%dx%dx%d", gdev->winSizeX, gdev->winSizeY,
-               bits_per_pixel);
-       printf("%s\n", gdev->modeIdent);
-       debug("Frame buffer at %x\n", gdev->frameAdrs);
-
-       return (void *)gdev;
-}