diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-09-04 14:11:08 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-09-11 07:15:10 +0200 |
| commit | e1ea802ea69b70826b997b9bb465e0b2a3b0fce8 (patch) | |
| tree | 4233123d351209455f886251b7268d8bef490e34 /src/arch/x86/boot | |
| parent | 1ae305efe1a0823c270767ddf6cc02c41ce146f8 (diff) | |
CBMEM tables: Remove references to global high_tables_base
Unify checks and writing of CBMEM tables for x86 and ARMv7.
Change-Id: I89c012bce1b86d0710748719a8840ec532ce6939
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3559
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/arch/x86/boot')
| -rw-r--r-- | src/arch/x86/boot/tables.c | 10 |
1 files changed, 2 insertions, 8 deletions
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 */ |