GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2014-01-26 11:32:51 +02:00
parent bea6bf07df
commit 9c479c9a3e
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/console/Makefile.inc
View File

@ -5,8 +5,7 @@ ramstage-y += vsprintf.c
ramstage-y += post.c ramstage-y += post.c
ramstage-y += die.c ramstage-y += die.c
smm-y += printk.c smm-$(CONFIG_DEBUG_SMI) += vtxprintf.c printk.c
smm-y += vtxprintf.c
smm-$(CONFIG_SMM_TSEG) += die.c smm-$(CONFIG_SMM_TSEG) += die.c
romstage-$(CONFIG_EARLY_CONSOLE) += vtxprintf.c romstage-$(CONFIG_EARLY_CONSOLE) += vtxprintf.c

8
src/cpu/x86/smm/smiutil.c
View File

@ -19,13 +19,10 @@
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
#include <arch/io.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/smm.h>
#include <console/console.h> #include <console/console.h>
#include <console/uart.h> #include <console/uart.h>
#include <console/vtxprintf.h>
#if CONFIG_DEBUG_SMI
void console_tx_flush(void) void console_tx_flush(void)
{ {
} }
@ -42,6 +39,7 @@ void console_tx_byte(unsigned char byte)
uart_tx_byte(byte); uart_tx_byte(byte);
#endif #endif
} }
#endif
void console_init(void) void console_init(void)
{ {
@ -53,8 +51,6 @@ void console_init(void)
#if CONFIG_CONSOLE_SERIAL8250MEM #if CONFIG_CONSOLE_SERIAL8250MEM
uart_init(); uart_init();
#endif #endif
#else
console_loglevel = 1;
#endif #endif
} }

6
src/drivers/uart/Makefile.inc
View File

@ -2,19 +2,19 @@ ifeq ($(CONFIG_CONSOLE_SERIAL),y)
romstage-y += util.c romstage-y += util.c
ramstage-y += util.c ramstage-y += util.c
bootblock-y += util.c bootblock-y += util.c
smm-y += util.c smm-$(CONFIG_DEBUG_SMI) += util.c
endif endif
ifeq ($(CONFIG_CONSOLE_SERIAL8250),y) ifeq ($(CONFIG_CONSOLE_SERIAL8250),y)
romstage-y += uart8250io.c romstage-y += uart8250io.c
ramstage-y += uart8250io.c ramstage-y += uart8250io.c
smm-y += uart8250io.c smm-$(CONFIG_DEBUG_SMI) += uart8250io.c
endif endif
ifeq ($(CONFIG_CONSOLE_SERIAL8250MEM),y) ifeq ($(CONFIG_CONSOLE_SERIAL8250MEM),y)
romstage-y += uart8250mem.c romstage-y += uart8250mem.c
ramstage-y += uart8250mem.c ramstage-y += uart8250mem.c
smm-y += uart8250mem.c smm-$(CONFIG_DEBUG_SMI) += uart8250mem.c
endif endif
ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y) ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)

1
src/include/console/console.h
View File

@ -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))); int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
#if defined(__BOOT_BLOCK__) && !CONFIG_BOOTBLOCK_CONSOLE || \ #if defined(__BOOT_BLOCK__) && !CONFIG_BOOTBLOCK_CONSOLE || \
defined(__SMM__) && !CONFIG_DEBUG_SMI || \
(defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__)) && !CONFIG_EARLY_CONSOLE (defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__)) && !CONFIG_EARLY_CONSOLE
static inline void printk(int LEVEL, const char *fmt, ...); static inline void printk(int LEVEL, const char *fmt, ...);