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

xtensa: Remove ELF_MACHINE from cpu.h 



The bootloaders can just pass EM_XTENSA directly, as that
is architecture specific code.

This removes another architecture specific definition from the global
namespace.

Cc: Max Filippov <jcmvbkbc@gmail.com>
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 7183128b

hw/xtensa/sim.c

+2 −2
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ static void xtensa_sim_init(MachineState *machine) 
        uint64_t elf_lowaddr;

#ifdef TARGET_WORDS_BIGENDIAN

        int success = load_elf(kernel_filename, translate_phys_addr, cpu,

                &elf_entry, &elf_lowaddr, NULL, 1, ELF_MACHINE, 0);

                &elf_entry, &elf_lowaddr, NULL, 1, EM_XTENSA, 0);

#else

        int success = load_elf(kernel_filename, translate_phys_addr, cpu,

                &elf_entry, &elf_lowaddr, NULL, 0, ELF_MACHINE, 0);

                &elf_entry, &elf_lowaddr, NULL, 0, EM_XTENSA, 0);

#endif

        if (success > 0) {

            env->pc = elf_entry;

hw/xtensa/xtfpga.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine) 
        uint64_t elf_entry;

        uint64_t elf_lowaddr;

        int success = load_elf(kernel_filename, translate_phys_addr, cpu,

                &elf_entry, &elf_lowaddr, NULL, be, ELF_MACHINE, 0);

                &elf_entry, &elf_lowaddr, NULL, be, EM_XTENSA, 0);

        if (success > 0) {

            entry_point = elf_entry;

        } else {

target-xtensa/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


#define ALIGNED_ONLY

#define TARGET_LONG_BITS 32

#define ELF_MACHINE EM_XTENSA



#define CPUArchState struct CPUXtensaState