Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index 5ca8820898b2939b0f5edea8dbe80043b5cdccd1..5cfdd762dc6ee1ee9844a1526eb82953e264ff22 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -272,6 +272,7 @@ void        reset_cmd_timeout(void);
 #ifdef CONFIG_MENU
 int    abortboot(int bootdelay);
 #endif
+extern char console_buffer[];
 
 /* arch/$(ARCH)/lib/board.c */
 void   board_init_f  (ulong) __attribute__ ((noreturn));
@@ -284,6 +285,13 @@ extern ulong monitor_flash_len;
 int mac_read_from_eeprom(void);
 extern u8 _binary_dt_dtb_start[];      /* embedded device tree blob */
 
+/*
+ * Called when console output is requested before the console is available.
+ * The board should do its best to get the character out to the user any way
+ * it can.
+ */
+void board_pre_console_putc(int ch);
+
 /* common/flash.c */
 void flash_perror (int);