UPSTREAM: sb/via/k8t890: Clean up CONFIG_VGA usage

Remove guards and let the linker take care of it.

BUG=none
BRANCH=none
TEST=none

Change-Id: I88864bb4de1b4185efb8ea8d42c61882dda1caf5
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: bb72852baf
Original-Change-Id: I96ad8002845082816153ca5762543768998a5619
Original-Signed-off-by: Nico Huber <nico.h@gmx.de>
Original-Reviewed-on: https://review.coreboot.org/19744
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://chromium-review.googlesource.com/510772
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
This commit is contained in:
Nico Huber 2017-05-17 20:56:56 +02:00 committed by chrome-bot
commit 4fa8c37a68

View file

@ -21,7 +21,6 @@
#include <string.h> /* for memset */
#include "k8x8xx.h"
#if CONFIG_VGA
#include <pc80/vga_io.h>
#include <pc80/vga.h>
#include <arch/io.h>
@ -109,8 +108,6 @@ chrome_vga_init(struct device *dev)
vga_cr_mask(0x33, 0x08, 0x08); /* Enable Prefetch Mode */
}
#endif /* CONFIG_VGA */
/*
*
*/
@ -138,19 +135,19 @@ chrome_init(struct device *dev)
//k8m890_host_fb_direct_set(fb_address);
#if CONFIG_VGA
/* Now set up the VGA console */
vga_io_init(); /* Enable full IO access */
if (IS_ENABLED(SOUTHBRIDGE_VIA_K8M890_VGA_EN)) {
/* Now set up the VGA console */
vga_io_init(); /* Enable full IO access */
chrome_vga_init(dev);
chrome_vga_init(dev);
vga_textmode_init();
vga_textmode_init();
printk(BIOS_INFO, "Chrome VGA Textmode initialized.\n");
printk(BIOS_INFO, "Chrome VGA Textmode initialized.\n");
/* if we don't have console, at least print something... */
vga_line_write(0, "Chrome VGA Textmode initialized.");
#endif /* CONFIG_VGA */
/* if we don't have console, at least print something... */
vga_line_write(0, "Chrome VGA Textmode initialized.");
}
}
static struct device_operations