projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialize CBMEM early.
[coreboot.git]
/
src
/
include
/
cbmem.h
diff --git
a/src/include/cbmem.h
b/src/include/cbmem.h
index d814a7285ac2b55573d2bf892a47d1ad3f346b8a..a681c36ea81cc92de94f1d3898466e04e012a218 100644
(file)
--- a/
src/include/cbmem.h
+++ b/
src/include/cbmem.h
@@
-20,14
+20,17
@@
#ifndef _CBMEM_H_
#define _CBMEM_H_
#ifndef _CBMEM_H_
#define _CBMEM_H_
-/* Reserve 64k for ACPI and other tables */
-#define HIGH_MEMORY_TABLES ( 64 * 1024 )
+/* Reserve 128k for ACPI and other tables */
+#define HIGH_MEMORY_DEF_SIZE ( 128 * 1024 )
+#ifndef __PRE_RAM__
+extern uint64_t high_tables_base, high_tables_size;
+#endif
#if CONFIG_HAVE_ACPI_RESUME
#if CONFIG_HAVE_ACPI_RESUME
-#define HIGH_MEMORY_SIZE (
1024 * 1024
)
-#define HIGH_MEMORY_SAVE ( HIGH_MEMORY_SIZE - HIGH_MEMORY_
TABLES
)
+#define HIGH_MEMORY_SIZE (
(CONFIG_RAMTOP - CONFIG_RAMBASE) + HIGH_MEMORY_DEF_SIZE
)
+#define HIGH_MEMORY_SAVE ( HIGH_MEMORY_SIZE - HIGH_MEMORY_
DEF_SIZE
)
#else
#else
-#define HIGH_MEMORY_SIZE HIGH_MEMORY_
TABLES
+#define HIGH_MEMORY_SIZE HIGH_MEMORY_
DEF_SIZE
#endif
#define CBMEM_ID_FREESPACE 0x46524545
#endif
#define CBMEM_ID_FREESPACE 0x46524545
@@
-37,9
+40,10
@@
#define CBMEM_ID_PIRQ 0x49525154
#define CBMEM_ID_MPTABLE 0x534d5054
#define CBMEM_ID_RESUME 0x5245534d
#define CBMEM_ID_PIRQ 0x49525154
#define CBMEM_ID_MPTABLE 0x534d5054
#define CBMEM_ID_RESUME 0x5245534d
+#define CBMEM_ID_SMBIOS 0x534d4254
#define CBMEM_ID_NONE 0x00000000
#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);
void cbmem_init(u64 baseaddr, u64 size);
int cbmem_reinit(u64 baseaddr);
@@
-48,4
+52,9
@@
void *cbmem_find(u32 id);
void cbmem_list(void);
void cbmem_arch_init(void);
void cbmem_list(void);
void cbmem_arch_init(void);
+extern struct cbmem_entry *get_cbmem_toc(void);
+
+#ifndef __PRE_RAM__
+void set_cbmem_toc(struct cbmem_entry *);
+#endif
#endif
#endif