diff mbox

[U-Boot,08/10] x86: Drop the x86_fb driver

Message ID 1419906751-29776-9-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Dec. 30, 2014, 2:32 a.m. UTC 
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>
---

 drivers/video/Makefile            |  1 -
 drivers/video/x86_fb.c            | 38 --------------------------------------
 include/configs/chromebook_link.h |  2 +-
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 drivers/video/x86_fb.c

Comments

Simon Glass Jan. 15, 2015, 4:25 a.m. UTC | #1 
On 29 December 2014 at 19:32, Simon Glass <sjg@chromium.org> wrote:
> 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>
> ---
>
>  drivers/video/Makefile            |  1 -
>  drivers/video/x86_fb.c            | 38 --------------------------------------
>  include/configs/chromebook_link.h |  2 +-
>  3 files changed, 1 insertion(+), 40 deletions(-)
>  delete mode 100644 drivers/video/x86_fb.c

Dropped the header file change and moved it to Kconfig, where this now
resides since Bin's series was applied first.

Applied to u-boot-x86.
diff mbox

Patch

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 91c954f..4da82b4 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -47,7 +47,6 @@  obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.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;
-}
diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index 8930210..1a53483 100644
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -41,7 +41,7 @@ 
 
 #define CONFIG_X86_OPTION_ROM_FILE		pci8086,0166.bin
 #define CONFIG_X86_OPTION_ROM_ADDR		0xfff90000
-#define CONFIG_VIDEO_X86
+#define CONFIG_VIDEO_VESA
 
 #define CONFIG_PCI_MEM_BUS	0xe0000000
 #define CONFIG_PCI_MEM_PHYS	CONFIG_PCI_MEM_BUS