tricore: Remove ELF_MACHINE from cpu.h

The bootloader can just pass EM_TRICORE directly, as that
is architecture specific code.

This removes another architecture specific definition from the global
namespace.

Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Acked-By: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
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 ed03ecf8f0
commit 7183128bc9
2 changed files with 1 additions and 3 deletions

View File

@ -44,7 +44,7 @@ static void tricore_load_kernel(CPUTriCoreState *env)
kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL, kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL,
NULL, (uint64_t *)&entry, NULL, NULL, (uint64_t *)&entry, NULL,
NULL, 0, NULL, 0,
ELF_MACHINE, 1); EM_TRICORE, 1);
if (kernel_size <= 0) { if (kernel_size <= 0) {
error_report("qemu: no kernel file '%s'", error_report("qemu: no kernel file '%s'",
tricoretb_binfo.kernel_filename); tricoretb_binfo.kernel_filename);

View File

@ -25,8 +25,6 @@
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "fpu/softfloat.h" #include "fpu/softfloat.h"
#define ELF_MACHINE EM_TRICORE
#define CPUArchState struct CPUTriCoreState #define CPUArchState struct CPUTriCoreState
struct CPUTriCoreState; struct CPUTriCoreState;