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

sparc: Remove ELF_MACHINE from cpu.h 



The bootloaders can just pass EM_SPARC or EM_SPARCV9 directly, as
they are architecture specific code (to one or the other).

This removes another architecture specific definition from the global
namespace.

Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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 99a4434e

hw/sparc/leon3.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void leon3_generic_hw_init(MachineState *machine) 
        uint64_t entry;



        kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, NULL, NULL,

                               1 /* big endian */, ELF_MACHINE, 0);

                               1 /* big endian */, EM_SPARC, 0);

        if (kernel_size < 0) {

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

                    kernel_filename);

hw/sparc/sun4m.c

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename, 
        bswap_needed = 0;

#endif

        kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,

                               NULL, NULL, NULL, 1, ELF_MACHINE, 0);

                               NULL, NULL, NULL, 1, EM_SPARC, 0);

        if (kernel_size < 0)

            kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR,

                                    RAM_size - KERNEL_LOAD_ADDR, bswap_needed,
@@ -744,7 +744,7 @@ static void prom_init(hwaddr addr, const char *bios_name) 
    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

    if (filename) {

        ret = load_elf(filename, translate_prom_address, &addr, NULL,

                       NULL, NULL, 1, ELF_MACHINE, 0);

                       NULL, NULL, 1, EM_SPARC, 0);

        if (ret < 0 || ret > PROM_SIZE_MAX) {

            ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);

        }

hw/sparc64/sun4u.c

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, 
        bswap_needed = 0;

#endif

        kernel_size = load_elf(kernel_filename, NULL, NULL, kernel_entry,

                               kernel_addr, &kernel_top, 1, ELF_MACHINE, 0);

                               kernel_addr, &kernel_top, 1, EM_SPARCV9, 0);

        if (kernel_size < 0) {

            *kernel_addr = KERNEL_LOAD_ADDR;

            *kernel_entry = KERNEL_LOAD_ADDR;
@@ -671,7 +671,7 @@ static void prom_init(hwaddr addr, const char *bios_name) 
    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

    if (filename) {

        ret = load_elf(filename, translate_prom_address, &addr,

                       NULL, NULL, NULL, 1, ELF_MACHINE, 0);

                       NULL, NULL, NULL, 1, EM_SPARCV9, 0);

        if (ret < 0 || ret > PROM_SIZE_MAX) {

            ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);

        }

target-sparc/cpu.h

+0 −6
Original line number Diff line number Diff line
@@ -31,12 +31,6 @@ 


#include "fpu/softfloat.h"



#if !defined(TARGET_SPARC64)

#define ELF_MACHINE     EM_SPARC

#else

#define ELF_MACHINE     EM_SPARCV9

#endif



/*#define EXCP_INTERRUPT 0x100*/



/* trap definitions */