From e1ea802ea69b70826b997b9bb465e0b2a3b0fce8 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 4 Sep 2013 14:11:08 +0300 Subject: CBMEM tables: Remove references to global high_tables_base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unify checks and writing of CBMEM tables for x86 and ARMv7. Change-Id: I89c012bce1b86d0710748719a8840ec532ce6939 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/3559 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Aaron Durbin --- src/arch/armv7/tables.c | 6 +----- src/arch/x86/boot/tables.c | 10 ++-------- 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'src/arch') diff --git a/src/arch/armv7/tables.c b/src/arch/armv7/tables.c index 0f174d30ff..de6b6facc3 100644 --- a/src/arch/armv7/tables.c +++ b/src/arch/armv7/tables.c @@ -37,11 +37,7 @@ struct lb_memory *write_tables(void) { unsigned long table_pointer, new_table_pointer; - if (!high_tables_base) { - printk(BIOS_ERR, "ERROR: high_tables_base is not set.\n"); - } - - printk(BIOS_DEBUG, "high_tables_base: %llx.\n", high_tables_base); + cbmem_base_check(); post_code(0x9d); diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index 31d0fc7a4a..eea9bf1c12 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -51,13 +51,7 @@ struct lb_memory *write_tables(void) unsigned long high_table_pointer; #if !CONFIG_DYNAMIC_CBMEM - if (!high_tables_base) { - printk(BIOS_ERR, "ERROR: High Tables Base is not set.\n"); - // Are there any boards without? - // Stepan thinks we should die() here! - } - - printk(BIOS_DEBUG, "High Tables Base is %llx.\n", high_tables_base); + cbmem_base_check(); #endif rom_table_start = 0xf0000; @@ -231,7 +225,7 @@ struct lb_memory *write_tables(void) #if CONFIG_DYNAMIC_CBMEM u64 fixme_high_tables_base = 0; #else - u64 fixme_high_tables_base = high_tables_base; + u64 fixme_high_tables_base = (u32)get_cbmem_toc(); #endif /* Also put a forwarder entry into 0-4K */ -- cgit v1.2.3