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, ...);