summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-26 11:32:51 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-03-04 15:36:27 +0100
commit9c479c9a3e3353d3a73e62d4b593bbe4129af4fd (patch)
treee24cd9de0b7ac357fe687b4a87a0abc1c8ca9316 /src
parentbea6bf07dfd9b97ad81fb7433464a9f61ff02105 (diff)
downloadcoreboot-9c479c9a3e3353d3a73e62d4b593bbe4129af4fd.tar.xz
SMM: Only have console with DEBUG_SMI
Existing code compiled serial communication and printk() for SMM even when DEBUG_SMI was not selected. Change-Id: Ic5e25cd7453cb2243f7ac592b093fba752a299f7 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5142 Tested-by: build bot (Jenkins) Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/console/Makefile.inc3
-rw-r--r--src/cpu/x86/smm/smiutil.c8
-rw-r--r--src/drivers/uart/Makefile.inc6
-rw-r--r--src/include/console/console.h1
4 files changed, 7 insertions, 11 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 62be1d2b23..54d59cdeca 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -5,8 +5,7 @@ ramstage-y += vsprintf.c
ramstage-y += post.c
ramstage-y += die.c
-smm-y += printk.c
-smm-y += vtxprintf.c
+smm-$(CONFIG_DEBUG_SMI) += vtxprintf.c printk.c
smm-$(CONFIG_SMM_TSEG) += die.c
romstage-$(CONFIG_EARLY_CONSOLE) += vtxprintf.c
diff --git a/src/cpu/x86/smm/smiutil.c b/src/cpu/x86/smm/smiutil.c
index 43731bc3c8..3325c328c9 100644
--- a/src/cpu/x86/smm/smiutil.c
+++ b/src/cpu/x86/smm/smiutil.c
@@ -19,13 +19,10 @@
* MA 02110-1301 USA
*/
-#include <arch/io.h>
-#include <cpu/x86/cache.h>
-#include <cpu/x86/smm.h>
#include <console/console.h>
#include <console/uart.h>
-#include <console/vtxprintf.h>
+#if CONFIG_DEBUG_SMI
void console_tx_flush(void)
{
}
@@ -42,6 +39,7 @@ void console_tx_byte(unsigned char byte)
uart_tx_byte(byte);
#endif
}
+#endif
void console_init(void)
{
@@ -53,8 +51,6 @@ void console_init(void)
#if CONFIG_CONSOLE_SERIAL8250MEM
uart_init();
#endif
-#else
- console_loglevel = 1;
#endif
}
diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc
index 3a9ca3d592..415c5bb095 100644
--- a/src/drivers/uart/Makefile.inc
+++ b/src/drivers/uart/Makefile.inc
@@ -2,19 +2,19 @@ ifeq ($(CONFIG_CONSOLE_SERIAL),y)
romstage-y += util.c
ramstage-y += util.c
bootblock-y += util.c
-smm-y += util.c
+smm-$(CONFIG_DEBUG_SMI) += util.c
endif
ifeq ($(CONFIG_CONSOLE_SERIAL8250),y)
romstage-y += uart8250io.c
ramstage-y += uart8250io.c
-smm-y += uart8250io.c
+smm-$(CONFIG_DEBUG_SMI) += uart8250io.c
endif
ifeq ($(CONFIG_CONSOLE_SERIAL8250MEM),y)
romstage-y += uart8250mem.c
ramstage-y += uart8250mem.c
-smm-y += uart8250mem.c
+smm-$(CONFIG_DEBUG_SMI) += uart8250mem.c
endif
ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
diff --git a/src/include/console/console.h b/src/include/console/console.h
index dfeedda5e0..a089729087 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -72,6 +72,7 @@ void __attribute__ ((noreturn)) die(const char *msg);
int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
#if defined(__BOOT_BLOCK__) && !CONFIG_BOOTBLOCK_CONSOLE || \
+ defined(__SMM__) && !CONFIG_DEBUG_SMI || \
(defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__)) && !CONFIG_EARLY_CONSOLE
static inline void printk(int LEVEL, const char *fmt, ...);