mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moxie: Remove ELF_MACHINE from cpu.h

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

3
hw/moxie/moxiesim.c
View File

@ -53,8 +53,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL, kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL,
&entry, &kernel_low, &kernel_high, 1, &entry, &kernel_low, &kernel_high, 1, EM_MOXIE, 0);
ELF_MACHINE, 0);
if (kernel_size <= 0) { if (kernel_size <= 0) {
fprintf(stderr, "qemu: could not load kernel '%s'\n", fprintf(stderr, "qemu: could not load kernel '%s'\n",

2
target-moxie/cpu.h
View File

@ -26,8 +26,6 @@
#define CPUArchState struct CPUMoxieState #define CPUArchState struct CPUMoxieState
#define ELF_MACHINE EM_MOXIE
#define MOXIE_EX_DIV0 0 #define MOXIE_EX_DIV0 0
#define MOXIE_EX_BAD 1 #define MOXIE_EX_BAD 1
#define MOXIE_EX_IRQ 2 #define MOXIE_EX_IRQ 2