aboutsummaryrefslogtreecommitdiff
path: root/src/include/console/cbmem_console.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/console/cbmem_console.h')
-rw-r--r--src/include/console/cbmem_console.h23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h
index 4f4a54f6b7..e7c6357ae4 100644
--- a/src/include/console/cbmem_console.h
+++ b/src/include/console/cbmem_console.h
@@ -19,14 +19,27 @@
#ifndef _CONSOLE_CBMEM_CONSOLE_H_
#define _CONSOLE_CBMEM_CONSOLE_H_
-#if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)
+#include <rules.h>
+#include <stdint.h>
+
void cbmemc_init(void);
-void cbmemc_reinit(void);
void cbmemc_tx_byte(unsigned char data);
+
+#if CONFIG_CONSOLE_CBMEM
+void cbmemc_reinit(void);
+#else
+static inline void cbmemc_reinit(void) {}
+#endif
+
+#define __CBMEM_CONSOLE_ENABLE__ CONFIG_CONSOLE_CBMEM && \
+ ((ENV_ROMSTAGE && CONFIG_EARLY_CBMEM_INIT) || ENV_RAMSTAGE)
+
+#if __CBMEM_CONSOLE_ENABLE__
+static inline void __cbmemc_init(void) { cbmemc_init(); }
+static inline void __cbmemc_tx_byte(u8 data) { cbmemc_tx_byte(data); }
#else
-#define cbmemc_init()
-#define cbmemc_reinit()
-#define cbmemc_tx_byte(x)
+static inline void __cbmemc_init(void) {}
+static inline void __cbmemc_tx_byte(u8 data) {}
#endif
#endif