diff options
| -rw-r--r-- | src/arch/x86/lib/romcc_console.c | 3 | ||||
| -rw-r--r-- | src/console/console.c | 2 | ||||
| -rw-r--r-- | src/include/console/cbmem_console.h | 6 | ||||
| -rw-r--r-- | src/lib/Makefile.inc | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c index 0e1f4e6003..13ee1f004f 100644 --- a/src/arch/x86/lib/romcc_console.c +++ b/src/arch/x86/lib/romcc_console.c @@ -46,9 +46,6 @@ static void __console_tx_byte(unsigned char byte) #if CONFIG_CONSOLE_NE2K ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT); #endif -#if CONFIG_CONSOLE_CBMEM - cbmemc_tx_byte(byte); -#endif } static void __console_tx_nibble(unsigned nibble) diff --git a/src/console/console.c b/src/console/console.c index b2b06b37f9..06a460428b 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -119,7 +119,7 @@ void console_init(void) #if CONFIG_SPKMODEM spkmodem_init(); #endif -#if CONFIG_USBDEBUG +#if CONFIG_USBDEBUG && !defined(__BOOT_BLOCK__) usbdebug_init(); #endif diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h index 37ea4d8e89..9e2f14e715 100644 --- a/src/include/console/cbmem_console.h +++ b/src/include/console/cbmem_console.h @@ -19,8 +19,14 @@ #ifndef _CONSOLE_CBMEM_CONSOLE_H_ #define _CONSOLE_CBMEM_CONSOLE_H_ +#if CONFIG_CACHE_AS_RAM || !defined(__PRE_RAM__) void cbmemc_init(void); void cbmemc_reinit(void); void cbmemc_tx_byte(unsigned char data); +#else +#define cbmemc_init() +#define cbmemc_reinit() +#define cbmemc_tx_byte() +#endif #endif diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index f3e7dc5ddd..44b5ebda65 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -47,12 +47,14 @@ romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c romstage-$(CONFIG_CACHE_AS_RAM) += ramtest.c romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c -romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c -romstage-$(CONFIG_USBDEBUG) += usbdebug.c romstage-$(CONFIG_SPKMODEM) += spkmodem.c +ifeq ($(CONFIG_CACHE_AS_RAM),y) romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c +romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c +romstage-$(CONFIG_USBDEBUG) += usbdebug.c +endif ifneq ($(CONFIG_DYNAMIC_CBMEM),y) romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c |