summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/armv7/tables.c7
-rw-r--r--src/arch/x86/boot/Makefile.inc2
-rw-r--r--src/arch/x86/boot/cbmem.c21
3 files changed, 30 insertions, 0 deletions
diff --git a/src/arch/armv7/tables.c b/src/arch/armv7/tables.c
index de6b6facc3..b566ff6130 100644
--- a/src/arch/armv7/tables.c
+++ b/src/arch/armv7/tables.c
@@ -29,6 +29,13 @@
#define MAX_COREBOOT_TABLE_SIZE (8 * 1024)
+void __attribute__((weak)) get_cbmem_table(uint64_t *base, uint64_t *size)
+{
+ printk(BIOS_WARNING, "WARNING: you need to define get_cbmem_table for your board\n");
+ *base = 0;
+ *size = 0;
+}
+
void cbmem_arch_init(void)
{
}
diff --git a/src/arch/x86/boot/Makefile.inc b/src/arch/x86/boot/Makefile.inc
index 9334839a62..d3a5f2163c 100644
--- a/src/arch/x86/boot/Makefile.inc
+++ b/src/arch/x86/boot/Makefile.inc
@@ -1,3 +1,5 @@
+romstage-y += cbmem.c
+
ramstage-y += boot.c
ramstage-$(CONFIG_MULTIBOOT) += multiboot.c
ramstage-y += gdt.c
diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index 6ec005d183..333ca55ccf 100644
--- a/src/arch/x86/boot/cbmem.c
+++ b/src/arch/x86/boot/cbmem.c
@@ -18,7 +18,28 @@
#include <console/console.h>
#include <cbmem.h>
+unsigned long __attribute__((weak)) get_top_of_ram(void)
+{
+ printk(BIOS_WARNING, "WARNING: you need to define get_top_of_ram() for your chipset\n");
+ return 0;
+}
+
#if !CONFIG_DYNAMIC_CBMEM
+void get_cbmem_table(uint64_t *base, uint64_t *size)
+{
+ uint64_t top_of_ram = get_top_of_ram();
+
+ if (top_of_ram >= HIGH_MEMORY_SIZE) {
+ *base = top_of_ram - HIGH_MEMORY_SIZE;
+ *size = HIGH_MEMORY_SIZE;
+ } else {
+ *base = 0;
+ *size = 0;
+ }
+}
+#endif
+
+#if !CONFIG_DYNAMIC_CBMEM && !defined(__PRE_RAM__)
/* This is for compatibility with old boards only. Any new chipset and board
* must implement get_top_of_ram() for both romstage and ramstage to support
* features like CAR_MIGRATION and CBMEM_CONSOLE.