diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-30 14:18:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-30 14:18:45 +0000 |
| commit | 204aa60b37c23a89e690d418f49787d274303ca7 (patch) | |
| tree | 902d059da93888c408d17ede0d92a1038cd4ff67 /hw/cris/boot.c | |
| parent | a09a2b5a4d85d4bf2f04b0e503d7dd7905967148 (diff) | |
| parent | 99029be1c2875cd857614397674bbf563ddb6f91 (diff) | |
| download | focaccia-qemu-204aa60b37c23a89e690d418f49787d274303ca7.tar.gz focaccia-qemu-204aa60b37c23a89e690d418f49787d274303ca7.zip | |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jan-29-2020' into staging
MIPS queue for January 29th, 2020 # gpg: Signature made Wed 29 Jan 2020 18:29:43 GMT # gpg: using RSA key D4972A8967F75A65 # gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full] # Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65 * remotes/amarkovic/tags/mips-queue-jan-29-2020: target/mips: Add implementation of GINVT instruction target/mips: Amend CP0 WatchHi register implementation hw/core/loader: Let load_elf() populate a field with CPU-specific flags target/mips: semihosting: Remove 'uhi_done' label in helper_do_semihosting() disas: Add a field for target-dependant data to disassemble_info target/mips: Rectify documentation on deprecating MIPS r4k machine Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/cris/boot.c')
| -rw-r--r-- | hw/cris/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/cris/boot.c b/hw/cris/boot.c index 2d2cc0c7a5..b8947bc660 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -76,7 +76,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) devboard SDK. */ image_size = load_elf(li->image_filename, NULL, translate_kernel_address, NULL, - &entry, NULL, &high, 0, EM_CRIS, 0, 0); + &entry, NULL, &high, NULL, 0, EM_CRIS, 0, 0); li->entry = entry; if (image_size < 0) { /* Takes a kimage from the axis devboard SDK. */ |