aboutsummaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/armv7/tables.c6
-rw-r--r--src/arch/x86/boot/tables.c10
2 files changed, 3 insertions, 13 deletions
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 */