summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/emulation/spike-riscv/romstage.c10
-rw-r--r--src/mainboard/lowrisc/nexys4ddr/mainboard.c5
-rw-r--r--src/soc/lowrisc/lowrisc/cbmem.c5
-rw-r--r--src/soc/ucb/riscv/cbmem.c5
4 files changed, 14 insertions, 11 deletions
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 <console/console.h>
#include <program_loading.h>
-#include <commonlib/configstring.h>
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 <cbmem.h>
-#include <commonlib/configstring.h>
#include <device/device.h>
#include <symbols.h>
@@ -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();
diff --git a/src/soc/lowrisc/lowrisc/cbmem.c b/src/soc/lowrisc/lowrisc/cbmem.c
index 44ffa26939..a21266608b 100644
--- a/src/soc/lowrisc/lowrisc/cbmem.c
+++ b/src/soc/lowrisc/lowrisc/cbmem.c
@@ -12,14 +12,15 @@
*/
#include <cbmem.h>
-#include <commonlib/configstring.h>
void *cbmem_top(void)
{
uintptr_t base;
size_t size;
- query_mem(configstring(), &base, &size);
+ /* FIXME: These values shouldn't necessarily be hardcoded */
+ base = 0x80000000;
+ size = 128 * MiB;
return (void *)(base + size);
}
diff --git a/src/soc/ucb/riscv/cbmem.c b/src/soc/ucb/riscv/cbmem.c
index 44ffa26939..f8f4098d75 100644
--- a/src/soc/ucb/riscv/cbmem.c
+++ b/src/soc/ucb/riscv/cbmem.c
@@ -19,7 +19,10 @@ void *cbmem_top(void)
uintptr_t base;
size_t size;
- query_mem(configstring(), &base, &size);
+ /* Use dummy values until we can query the memory size again */
+ //query_mem(configstring(), &base, &size);
+ base = 0x80000000;
+ size = 128 * MiB;
return (void *)(base + size);
}