summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2017-05-17 20:56:56 +0200
committerNico Huber <nico.h@gmx.de>2017-05-22 10:21:34 +0200
commitbb72852baf182dc0ec42a8fa18da8830d87ee2ef (patch)
tree08f8dfc77f3b6ba61f919b4408225125d571b81d
parent27f0ca18bc6a9a65dcd59664330fdafbf7776847 (diff)
sb/via/k8t890: Clean up CONFIG_VGA usage
Remove guards and let the linker take care of it. Change-Id: I96ad8002845082816153ca5762543768998a5619 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/19744 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
-rw-r--r--src/southbridge/via/k8t890/chrome.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/southbridge/via/k8t890/chrome.c b/src/southbridge/via/k8t890/chrome.c
index 1c46ab6636..5b6d6d2e73 100644
--- a/src/southbridge/via/k8t890/chrome.c
+++ b/src/southbridge/via/k8t890/chrome.c
@@ -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