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 | b744d332f3ef17adc1219be7098b0a4cc30b2dbe (patch) | |
| tree | 67d9d84dab4461a8b6878d79f2d3f896b30bb8c3 | |
| parent | 7233df4949df2b6c2b417beaf336a180b3c66e25 (diff) | |
| download | qemu-b744d332f3ef17adc1219be7098b0a4cc30b2dbe.tar.gz | |
moxie: Remove ELF_MACHINE from cpu.h
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 <green@moxielogic.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/moxie/moxiesim.c | 3 | ||||
| -rw-r--r-- | target-moxie/cpu.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 4e98c20f23..ada3d58829 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 7d47e0d956..2bac15bf60 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 |