diff options
author | Peter Crosthwaite <crosthwaitepeter@gmail.com> | 2015-05-10 23:29:10 -0700 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-25 12:04:43 +0200 |
commit | 7233df4949df2b6c2b417beaf336a180b3c66e25 (patch) | |
tree | 0175ca12ac88021dcde8e9b7c83e3398f017554b | |
parent | 45e6b8b61a7bbb71d1fa6c4193b47ba3a1f9f033 (diff) | |
download | qemu-7233df4949df2b6c2b417beaf336a180b3c66e25.zip qemu-7233df4949df2b6c2b417beaf336a180b3c66e25.tar.gz qemu-7233df4949df2b6c2b417beaf336a180b3c66e25.tar.bz2 |
cris: 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 bootloader can just pass EM_CRIS directly, as that is architecture
specific code.
This removes another architecture specific definition from the global
namespace.
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
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>
-rw-r--r-- | hw/cris/boot.c | 2 | ||||
-rw-r--r-- | target-cris/cpu.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/hw/cris/boot.c b/hw/cris/boot.c index 622f353..1cfa339 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -72,7 +72,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) /* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis devboard SDK. */ image_size = load_elf(li->image_filename, translate_kernel_address, NULL, - &entry, NULL, &high, 0, ELF_MACHINE, 0); + &entry, NULL, &high, 0, EM_CRIS, 0); li->entry = entry; if (image_size < 0) { /* Takes a kimage from the axis devboard SDK. */ diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 8ae7708..d47fad4 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -29,8 +29,6 @@ #include "exec/cpu-defs.h" -#define ELF_MACHINE EM_CRIS - #define EXCP_NMI 1 #define EXCP_GURU 2 #define EXCP_BUSFAULT 3 |