mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
or32: Remove ELF_MACHINE from cpu.h
The only generic code relying on this is linux-user, but linux users' default behaviour of defaulting ELF_MACHINE to ELF_ARCH will handle this. The bootloader can just pass EM_OPENRISC directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Jia Liu <proljc@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:
parent
22d2fb4c59
commit
ed03ecf8f0
|
@ -68,7 +68,7 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size,
|
||||||
|
|
||||||
if (kernel_filename && !qtest_enabled()) {
|
if (kernel_filename && !qtest_enabled()) {
|
||||||
kernel_size = load_elf(kernel_filename, NULL, NULL,
|
kernel_size = load_elf(kernel_filename, NULL, NULL,
|
||||||
&elf_entry, NULL, NULL, 1, ELF_MACHINE, 1);
|
&elf_entry, NULL, NULL, 1, EM_OPENRISC, 1);
|
||||||
entry = elf_entry;
|
entry = elf_entry;
|
||||||
if (kernel_size < 0) {
|
if (kernel_size < 0) {
|
||||||
kernel_size = load_uimage(kernel_filename,
|
kernel_size = load_uimage(kernel_filename,
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#define CPU_OPENRISC_H
|
#define CPU_OPENRISC_H
|
||||||
|
|
||||||
#define TARGET_LONG_BITS 32
|
#define TARGET_LONG_BITS 32
|
||||||
#define ELF_MACHINE EM_OPENRISC
|
|
||||||
|
|
||||||
#define CPUArchState struct CPUOpenRISCState
|
#define CPUArchState struct CPUOpenRISCState
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue