diff options
| author | Peter Maydell | 2020-09-28 17:49:10 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-09-28 17:49:10 +0200 |
| commit | 74504514b154ebebdff577d88e4bf5c13074e9ed (patch) | |
| tree | d94d264f606b98303f9467c1472f447a6b3ae53e /hw/nios2/boot.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pul... (diff) | |
| parent | core/register: Specify instance_size in the TypeInfo (diff) | |
| download | qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.gz qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.xz 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/nios2/boot.c')
| -rw-r--r-- | hw/nios2/boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 88224aa84c..1df3b66c29 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -139,7 +139,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, if (kernel_filename) { int kernel_size, fdt_size; - uint64_t entry, low, high; + uint64_t entry, high; int big_endian = 0; #ifdef TARGET_WORDS_BIGENDIAN @@ -148,7 +148,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, /* Boots a kernel elf binary. */ kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, - &entry, &low, &high, NULL, + &entry, NULL, &high, NULL, big_endian, EM_ALTERA_NIOS2, 0, 0); if ((uint32_t)entry == 0xc0000000) { /* |