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 | f4fc2bbfa2abd655ddcc622a8ae18c368bbce992 (patch) | |
| tree | d10a151ba6f5bdaed4416356ced0ae69005e0be8 | |
| parent | b597c3f7da17fcb37d394a16a6c0ef0a02846177 (diff) | |
| download | focaccia-qemu-f4fc2bbfa2abd655ddcc622a8ae18c368bbce992.tar.gz focaccia-qemu-f4fc2bbfa2abd655ddcc622a8ae18c368bbce992.zip | |
mb: Remove ELF_MACHINE from cpu.h
The only generic code relying on this is linux-user, but linux-users' default behaviour or setting ELF_MACHINE to ELF_ARCH will handle this. The microblaze bootloader can just pass EM_MICROBLAZE directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Edgar E. Iglesias <edgar.iglesias@gmail.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/microblaze/boot.c | 4 | ||||
| -rw-r--r-- | target-microblaze/cpu.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 3e8820f365..d7eaa1f022 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -141,12 +141,12 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, /* Boots a kernel elf binary. */ kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, &low, &high, - big_endian, ELF_MACHINE, 0); + big_endian, EM_MICROBLAZE, 0); base32 = entry; if (base32 == 0xc0000000) { kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, &entry, NULL, NULL, - big_endian, ELF_MACHINE, 0); + big_endian, EM_MICROBLAZE, 0); } /* Always boot into physical ram. */ boot_info.bootstrap_pc = (uint32_t)entry; diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 402124a051..b707c71367 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -34,8 +34,6 @@ typedef struct CPUMBState CPUMBState; #include "mmu.h" #endif -#define ELF_MACHINE EM_MICROBLAZE - #define EXCP_MMU 1 #define EXCP_IRQ 2 #define EXCP_BREAK 3 |