From 67b3268fac933c33a00a036dab4dfa366ffc3639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Fri, 29 Sep 2017 06:29:38 +0200 Subject: RISC-V boards: Stop using the config string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RISC-V is moving towards OpenFirmware-derived device trees, and the old functions to read the config string don't work anymore. Use dummy values for the memory base and size until we can query the device tree. Change-Id: Ice13feae4da2085ee56bac4ac2864268da18d8fe Signed-off-by: Jonathan Neuschäfer Reviewed-on: https://review.coreboot.org/21690 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/mainboard/emulation/spike-riscv/romstage.c | 10 ++++------ src/mainboard/lowrisc/nexys4ddr/mainboard.c | 5 +++-- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/emulation/spike-riscv/romstage.c b/src/mainboard/emulation/spike-riscv/romstage.c index dccdf226fb..79daaadc2c 100644 --- a/src/mainboard/emulation/spike-riscv/romstage.c +++ b/src/mainboard/emulation/spike-riscv/romstage.c @@ -15,15 +15,13 @@ #include #include -#include void main(void) { - uintptr_t base; - size_t size; - console_init(); - query_mem(configstring(), &base, &size); - printk(BIOS_SPEW, "0x%zx bytes of memory at 0x%llx\n", size, base); + + //query_mem(configstring(), &base, &size); + //printk(BIOS_SPEW, "0x%zx bytes of memory at 0x%llx\n", size, base); + run_ramstage(); } diff --git a/src/mainboard/lowrisc/nexys4ddr/mainboard.c b/src/mainboard/lowrisc/nexys4ddr/mainboard.c index aae3b9b93d..845539a54f 100644 --- a/src/mainboard/lowrisc/nexys4ddr/mainboard.c +++ b/src/mainboard/lowrisc/nexys4ddr/mainboard.c @@ -14,7 +14,6 @@ */ #include -#include #include #include @@ -23,7 +22,9 @@ static void mainboard_enable(device_t dev) uintptr_t ram_base; size_t ram_size; - query_mem(configstring(), &ram_base, &ram_size); + /* FIXME: These values shouldn't necessarily be hardcoded */ + ram_base = 0x80000000; + ram_size = 128 * MiB; ram_resource(dev, 0, ram_base / KiB, ram_size / KiB); cbmem_initialize_empty(); -- cgit v1.2.3