OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cris: Remove ELF_MACHINE from cpu.h

Browse Source 
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>
This commit is contained in:
Peter Crosthwaite 2015-05-10 23:29:10 -07:00 committed by Paolo Bonzini
parent 45e6b8b61a
commit 7233df4949
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/cris/boot.c
View File

@ -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 /* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis
devboard SDK. */ devboard SDK. */
image_size = load_elf(li->image_filename, translate_kernel_address, NULL, 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; li->entry = entry;
if (image_size < 0) { if (image_size < 0) {
/* Takes a kimage from the axis devboard SDK. */ /* Takes a kimage from the axis devboard SDK. */

2
target-cris/cpu.h
View File

@ -29,8 +29,6 @@
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#define ELF_MACHINE EM_CRIS
#define EXCP_NMI 1 #define EXCP_NMI 1
#define EXCP_GURU 2 #define EXCP_GURU 2
#define EXCP_BUSFAULT 3 #define EXCP_BUSFAULT 3