From: Peter Crosthwaite <[email protected]> The bootloader can just pass EM_MOXIE directly, as that is architecture specific code.
This removes another architecture specific definition from the global namespace. Cc: Anthony Green <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Acked-By: Riku Voipio <[email protected]> Signed-off-by: Peter Crosthwaite <[email protected]> --- Changed since V1 Use EM_MOXIE macro (rth) review hw/moxie/moxiesim.c | 3 +-- target-moxie/cpu.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 537e25e..83b45f1 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -53,8 +53,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) ram_addr_t initrd_offset; kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL, - &entry, &kernel_low, &kernel_high, 1, - ELF_MACHINE, 0); + &entry, &kernel_low, &kernel_high, 1, EM_MOXIE, 0); if (kernel_size <= 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index 7bb1ed9..e27a6a3 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -26,8 +26,6 @@ #define CPUArchState struct CPUMoxieState -#define ELF_MACHINE EM_MOXIE - #define MOXIE_EX_DIV0 0 #define MOXIE_EX_BAD 1 #define MOXIE_EX_IRQ 2 -- 1.9.1
