diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-28 16:49:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-28 16:49:10 +0100 |
| commit | 74504514b154ebebdff577d88e4bf5c13074e9ed (patch) | |
| tree | d94d264f606b98303f9467c1472f447a6b3ae53e /hw/arm/armv7m.c | |
| parent | 92d09502676678c8ebb1ad830666b323d3c88f9d (diff) | |
| parent | e8a612b7e3cdbdface1e34a27300ca2f8521dee0 (diff) | |
| download | focaccia-qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.gz focaccia-qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.zip | |
Merge remote-tracking branch 'remotes/alistair/tags/pull-register-20200927' into staging
Two small patches. One with a fix for the register API instance_size and one for removing unused address variables from load_elf. # gpg: Signature made Sun 27 Sep 2020 14:45:06 BST # gpg: using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054 # gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [full] # Primary key fingerprint: F6C4 AC46 D493 4868 D3B8 CE8F 21E1 0D29 DF97 7054 * remotes/alistair/tags/pull-register-20200927: core/register: Specify instance_size in the TypeInfo load_elf: Remove unused address variables from callers Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/armv7m.c')
| -rw-r--r-- | hw/arm/armv7m.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 0e5997d333..8113b29f1f 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -292,7 +292,6 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) { int image_size; uint64_t entry; - uint64_t lowaddr; int big_endian; AddressSpace *as; int asidx; @@ -313,12 +312,11 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) if (kernel_filename) { image_size = load_elf_as(kernel_filename, NULL, NULL, NULL, - &entry, &lowaddr, NULL, + &entry, NULL, NULL, NULL, big_endian, EM_ARM, 1, 0, as); if (image_size < 0) { image_size = load_image_targphys_as(kernel_filename, 0, mem_size, as); - lowaddr = 0; } if (image_size < 0) { error_report("Could not load kernel '%s'", kernel_filename); |