summaryrefslogtreecommitdiffstats
path: root/hw/mips/mips_malta.c
diff options
context:
space:
mode:
authorPeter Crosthwaite <crosthwaitepeter@gmail.com>2015-05-10 23:29:10 -0700
committerPaolo Bonzini <pbonzini@redhat.com>2015-09-25 12:04:44 +0200
commit04ce380e9e3fad1dbf4e86ebdf9315573a06b30e (patch)
tree647cf991079292a9a3011944cd1640e1c5a24cd9 /hw/mips/mips_malta.c
parent77452383e0c45704e2339b58eac29a3730bc18b1 (diff)
downloadhqemu-04ce380e9e3fad1dbf4e86ebdf9315573a06b30e.zip
hqemu-04ce380e9e3fad1dbf4e86ebdf9315573a06b30e.tar.gz
mips: Remove ELF_MACHINE from cpu.h
The only generic code relying on this is linux-user, but linux users' default behaviour of defaulting ELF_MACHINE to ELF_ARCH will handle this. The bootloaders can just pass EM_MIPS directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Leon Alrae <leon.alrae@imgtec.com> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Richard Henderson <rth@twiddle.net> Acked-By: Riku Voipio <riku.voipio@linaro.org> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/mips/mips_malta.c')
-rw-r--r--hw/mips/mips_malta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index bb864fe..c1f570a 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -795,7 +795,7 @@ static int64_t load_kernel (void)
if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL,
(uint64_t *)&kernel_entry, NULL, (uint64_t *)&kernel_high,
- big_endian, ELF_MACHINE, 1) < 0) {
+ big_endian, EM_MIPS, 1) < 0) {
fprintf(stderr, "qemu: could not load kernel '%s'\n",
loaderparams.kernel_filename);
exit(1);
OpenPOWER on IntegriCloud