From aca2150a4f174ebbd5c9e92c4cac2258138d1618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 1 Dec 2014 20:35:43 +0200 Subject: [PATCH] UCB RISCV: Switch to DYNAMIC_CBMEM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaaf68fd19f7b9a5b6849fffde3a9c68cb7862367 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7619 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/arch/riscv/tables.c | 20 -------------------- src/soc/ucb/riscv/Kconfig | 1 + 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/arch/riscv/tables.c b/src/arch/riscv/tables.c index 02659491ea..6300f7b154 100644 --- a/src/arch/riscv/tables.c +++ b/src/arch/riscv/tables.c @@ -29,15 +29,6 @@ #define MAX_COREBOOT_TABLE_SIZE (8 * 1024) -#if ! IS_ENABLED(CONFIG_DYNAMIC_CBMEM) -/* - * TODO: "High" tables are a convention used on x86. Maybe we can - * clean up that naming at some point. - */ -uint64_t high_tables_base = 0; -uint64_t high_tables_size; -#endif - void cbmem_arch_init(void) { } @@ -47,14 +38,6 @@ static struct lb_memory *wtf_write_tables(void) { unsigned long table_pointer, new_table_pointer; -#if ! IS_ENABLED(CONFIG_DYNAMIC_CBMEM) - 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); -#endif - post_code(0x9d); table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE, @@ -91,6 +74,3 @@ void write_tables(void) void cbmem_fail_resume(void) { } -void get_cbmem_table(uint64_t *base, uint64_t *size) -{ -} diff --git a/src/soc/ucb/riscv/Kconfig b/src/soc/ucb/riscv/Kconfig index d1e4ba7560..be4a675cd6 100644 --- a/src/soc/ucb/riscv/Kconfig +++ b/src/soc/ucb/riscv/Kconfig @@ -3,6 +3,7 @@ config SOC_UCB_RISCV select ARCH_BOOTBLOCK_RISCV select ARCH_ROMSTAGE_RISCV select ARCH_RAMSTAGE_RISCV + select DYNAMIC_CBMEM bool default n