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

mb: Remove ELF_MACHINE from cpu.h

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

4
hw/microblaze/boot.c
View File

@ -141,12 +141,12 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
/* Boots a kernel elf binary. */ /* Boots a kernel elf binary. */
kernel_size = load_elf(kernel_filename, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL,
&entry, &low, &high, &entry, &low, &high,
big_endian, ELF_MACHINE, 0); big_endian, EM_MICROBLAZE, 0);
base32 = entry; base32 = entry;
if (base32 == 0xc0000000) { if (base32 == 0xc0000000) {
kernel_size = load_elf(kernel_filename, translate_kernel_address, kernel_size = load_elf(kernel_filename, translate_kernel_address,
NULL, &entry, NULL, NULL, NULL, &entry, NULL, NULL,
big_endian, ELF_MACHINE, 0); big_endian, EM_MICROBLAZE, 0);
} }
/* Always boot into physical ram. */ /* Always boot into physical ram. */
boot_info.bootstrap_pc = (uint32_t)entry; boot_info.bootstrap_pc = (uint32_t)entry;

2
target-microblaze/cpu.h
View File

@ -34,8 +34,6 @@ typedef struct CPUMBState CPUMBState;
#include "mmu.h" #include "mmu.h"
#endif #endif
#define ELF_MACHINE EM_MICROBLAZE
#define EXCP_MMU 1 #define EXCP_MMU 1
#define EXCP_IRQ 2 #define EXCP_IRQ 2
#define EXCP_BREAK 3 #define EXCP_BREAK 3