From d9a98581ce5f94b2c8278aafcbb845f630ad7d71 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 21 Dec 2013 11:02:14 +0100 Subject: armv7: Prepare tables code for dynamic CBMEM The CBMEM API is different for dynamic CBMEM, so hide the functions that get in the way (but our compiler complains about) Change-Id: I7634a202059548e56c74fe3fe6eff57bc60f1a1b Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/4546 Tested-by: build bot (Jenkins) --- src/arch/armv7/tables.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/arch/armv7') diff --git a/src/arch/armv7/tables.c b/src/arch/armv7/tables.c index b566ff6130..cf4e4e03eb 100644 --- a/src/arch/armv7/tables.c +++ b/src/arch/armv7/tables.c @@ -29,12 +29,14 @@ #define MAX_COREBOOT_TABLE_SIZE (8 * 1024) +#if !CONFIG_DYNAMIC_CBMEM 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; } +#endif void cbmem_arch_init(void) { @@ -44,7 +46,9 @@ struct lb_memory *write_tables(void) { unsigned long table_pointer, new_table_pointer; +#if !CONFIG_DYNAMIC_CBMEM cbmem_base_check(); +#endif post_code(0x9d); -- cgit v1.2.3