Commit 04ce380e authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Paolo Bonzini
Browse files

mips: 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 bootloaders can just pass EM_MIPS directly, as that is
architecture specific code.

This removes another architecture specific definition from the global
namespace.

Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Acked-By: default avatarRiku Voipio <riku.voipio@linaro.org>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 77452383

hw/mips/mips_fulong2e.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int64_t load_kernel (CPUMIPSState *env) 


    if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL,

                 (uint64_t *)&kernel_entry, (uint64_t *)&kernel_low,

                 (uint64_t *)&kernel_high, 0, ELF_MACHINE, 1) < 0) {

                 (uint64_t *)&kernel_high, 0, EM_MIPS, 1) < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n",

                loaderparams.kernel_filename);

        exit(1);

hw/mips/mips_malta.c

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ static int64_t load_kernel (void) 


    if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL,

                 (uint64_t *)&kernel_entry, NULL, (uint64_t *)&kernel_high,

                 big_endian, ELF_MACHINE, 1) < 0) {

                 big_endian, EM_MIPS, 1) < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n",

                loaderparams.kernel_filename);

        exit(1);

hw/mips/mips_mipssim.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int64_t load_kernel(void) 
    kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,

                           NULL, (uint64_t *)&entry, NULL,

                           (uint64_t *)&kernel_high, big_endian,

                           ELF_MACHINE, 1);

                           EM_MIPS, 1);

    if (kernel_size >= 0) {

        if ((entry & ~0x7fffffffULL) == 0x80000000)

            entry = (int32_t)entry;

hw/mips/mips_r4k.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int64_t load_kernel(void) 
    kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,

                           NULL, (uint64_t *)&entry, NULL,

                           (uint64_t *)&kernel_high, big_endian,

                           ELF_MACHINE, 1);

                           EM_MIPS, 1);

    if (kernel_size >= 0) {

        if ((entry & ~0x7fffffffULL) == 0x80000000)

            entry = (int32_t)entry;

target-mips/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 


#define ALIGNED_ONLY



#define ELF_MACHINE	EM_MIPS



#define CPUArchState struct CPUMIPSState



#include "config.h"