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>
This commit is contained in:
@@ -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);
|
||||
|
||||
|
@@ -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 */
|
||||
|
Reference in New Issue
Block a user