CBMEM CONSOLE: Add CBMEM type for console buffer.

[coreboot.git] / src / include / cbmem.h

diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 5fd2e78aff7cb00015ee8b1bffc4bdb8bb280e91..6a48dd20e08810c66c558a4d84d24589a2bc062e 100644 (file)
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -20,9 +20,16 @@
 #ifndef _CBMEM_H_
 #define _CBMEM_H_
 
-/* Reserve 64k for ACPI and other tables */
-#define HIGH_MEMORY_DEF_SIZE   ( 64 * 1024 )
+/* Reserve 128k for ACPI and other tables */
+#if CONFIG_CONSOLE_CBMEM
+#define HIGH_MEMORY_DEF_SIZE   ( 256 * 1024 )
+#else
+#define HIGH_MEMORY_DEF_SIZE   ( 128 * 1024 )
+#endif
+
+#ifndef __PRE_RAM__
 extern uint64_t high_tables_base, high_tables_size;
+#endif
 
 #if CONFIG_HAVE_ACPI_RESUME
 #define HIGH_MEMORY_SIZE       ((CONFIG_RAMTOP - CONFIG_RAMBASE) + HIGH_MEMORY_DEF_SIZE)
@@ -38,9 +45,12 @@ extern uint64_t high_tables_base, high_tables_size;
 #define CBMEM_ID_PIRQ          0x49525154
 #define CBMEM_ID_MPTABLE       0x534d5054
 #define CBMEM_ID_RESUME                0x5245534d
+#define CBMEM_ID_SMBIOS         0x534d4254
+#define CBMEM_ID_TIMESTAMP     0x54494d45
+#define CBMEM_ID_CONSOLE       0x434f4e53
 #define CBMEM_ID_NONE          0x00000000
 
-void cbmem_initialize(void);
+int cbmem_initialize(void);
 
 void cbmem_init(u64 baseaddr, u64 size);
 int cbmem_reinit(u64 baseaddr);
@@ -49,8 +59,9 @@ void *cbmem_find(u32 id);
 void cbmem_list(void);
 void cbmem_arch_init(void);
 
+extern struct cbmem_entry *get_cbmem_toc(void);
+
 #ifndef __PRE_RAM__
-struct cbmem_entry *get_cbmem_toc(void);
 void set_cbmem_toc(struct cbmem_entry *);
 #endif
 #endif