X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Finclude%2Fcbmem.h;h=6a48dd20e08810c66c558a4d84d24589a2bc062e;hb=be25a4ded0957a0ca31f94d32857f1cb03aa42ff;hp=98068543f20c5e0cf87fe6b5215b40c360f52426;hpb=294edb24b5a79b90db669d372e17741dc30354c0;p=coreboot.git

diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 98068543f..6a48dd20e 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -21,8 +21,15 @@
 #define _CBMEM_H_
 
 /* 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)
@@ -39,9 +46,11 @@ extern uint64_t high_tables_base, high_tables_size;
 #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);