Message ID | 55f8a6b84e2434a11c3c8bdecc3f9f5c417a3f77.1439679104.git.crosthwaite.peter@gmail.com |
---|---|
State | New |
Headers | show |
Am 15.08.2015 um 16:28 schrieb Peter Crosthwaite: > From: Peter Crosthwaite <crosthwaitepeter@gmail.com> > > 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> > Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > --- > Acked-By: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index a059a20..62b406b 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -44,7 +44,7 @@ static void tricore_load_kernel(CPUTriCoreState *env) kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL, NULL, (uint64_t *)&entry, NULL, NULL, 0, - ELF_MACHINE, 1); + EM_TRICORE, 1); if (kernel_size <= 0) { error_report("qemu: no kernel file '%s'", tricoretb_binfo.kernel_filename); diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h index 916ee27..a72a7d8 100644 --- a/target-tricore/cpu.h +++ b/target-tricore/cpu.h @@ -25,8 +25,6 @@ #include "exec/cpu-defs.h" #include "fpu/softfloat.h" -#define ELF_MACHINE EM_TRICORE - #define CPUArchState struct CPUTriCoreState struct CPUTriCoreState;