From: Peter Crosthwaite <crosthwaitepe...@gmail.com>
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 <jcmvb...@gmail.com>
Reviewed-by: Richard Henderson <r...@twiddle.net>
Acked-By: Riku Voipio <riku.voi...@linaro.org>
Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
hw/xtensa/sim.c | 4 ++--
hw/xtensa/xtfpga.c | 2 +-
target-xtensa/cpu.h | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index aa1cd10..6266b8d 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -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;
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 7aca1cf..72350f1 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -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 {
diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index dbd2c9c..148a0f8 100644
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -30,7 +30,6 @@
#define ALIGNED_ONLY
#define TARGET_LONG_BITS 32
-#define ELF_MACHINE EM_XTENSA
#define CPUArchState struct CPUXtensaState
--
2.5.0
