diff options
| author | Simon Glass <sjg@chromium.org> | 2014-12-29 19:32:29 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-01-23 17:24:53 -0700 |
| commit | edb8b7a66b75045cc9e16a2762cd8344cdcd9bf5 (patch) | |
| tree | c1b5961fee13b20b730f30aac73b3ee772d3162a /drivers/video | |
| parent | 6b1ba984507039a893b14c2dec3c7b1edbc8413d (diff) | |
| download | u-boot-edb8b7a66b75045cc9e16a2762cd8344cdcd9bf5.zip u-boot-edb8b7a66b75045cc9e16a2762cd8344cdcd9bf5.tar.gz u-boot-edb8b7a66b75045cc9e16a2762cd8344cdcd9bf5.tar.bz2 | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/video/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/x86_fb.c | 38 |
3 files changed, 0 insertions, 48 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 697171e..51728b3 100644 --- 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 9f3c8bb..af2d47b 100644 --- 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 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; -} |