[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 037/113] cris: do not use ram_size global
From: |
Paolo Bonzini |
Subject: |
[PULL 037/113] cris: do not use ram_size global |
Date: |
Wed, 2 Dec 2020 03:07:33 -0500 |
Use the machine properties instead.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/cris/axis_dev88.c | 1 +
hw/cris/boot.c | 2 +-
hw/cris/boot.h | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index dab7423c73..b0cb6d84af 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -333,6 +333,7 @@ void axisdev88_init(MachineState *machine)
if (kernel_filename) {
li.image_filename = kernel_filename;
li.cmdline = kernel_cmdline;
+ li.ram_size = machine->ram_size;
cris_load_image(cpu, &li);
} else if (!qtest_enabled()) {
fprintf(stderr, "Kernel image must be specified\n");
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index aa8d2756d6..9fa09cfd83 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -81,7 +81,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
if (image_size < 0) {
/* Takes a kimage from the axis devboard SDK. */
image_size = load_image_targphys(li->image_filename, 0x40004000,
- ram_size);
+ li->ram_size);
li->entry = 0x40004000;
}
diff --git a/hw/cris/boot.h b/hw/cris/boot.h
index 218854e5d1..9f1e0e340c 100644
--- a/hw/cris/boot.h
+++ b/hw/cris/boot.h
@@ -6,6 +6,7 @@ struct cris_load_info
const char *image_filename;
const char *cmdline;
int image_size;
+ ram_addr_t ram_size;
hwaddr entry;
};
--
2.26.2
- [PULL 025/113] lm32: remove bios_name, (continued)
- [PULL 025/113] lm32: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 020/113] hw/net/xilinx_axienet: Rename StreamSlave as StreamSink, Paolo Bonzini, 2020/12/02
- [PULL 027/113] mips: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 018/113] hw/core/stream: Rename StreamSlave as StreamSink, Paolo Bonzini, 2020/12/02
- [PULL 016/113] hw/ssi: Update coding style to make checkpatch.pl happy, Paolo Bonzini, 2020/12/02
- [PULL 028/113] moxie: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 017/113] hw/ssi: Rename SSI 'slave' as 'peripheral', Paolo Bonzini, 2020/12/02
- [PULL 023/113] hppa: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 026/113] m68k: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 030/113] rx: move BIOS load from MCU to board, Paolo Bonzini, 2020/12/02
- [PULL 037/113] cris: do not use ram_size global,
Paolo Bonzini <=
- [PULL 031/113] s390: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 038/113] hppa: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 036/113] arm: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 029/113] ppc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 032/113] sh4: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 035/113] vl: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 034/113] digic: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 040/113] m68k: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 033/113] sparc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 041/113] microblaze: do not use ram_size global, Paolo Bonzini, 2020/12/02