From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksr-0006uH-2W for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksn-0000es-2v for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:05 -0400 Received: from mail-pd0-x22e.google.com ([2607:f8b0:400e:c02::22e]:36197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksm-0000eT-Rr for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:01 -0400 Received: by pdbmi9 with SMTP id mi9so2015924pdb.3 for ; Sat, 15 Aug 2015 16:29:00 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 15 Aug 2015 16:28:22 -0700 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 12/19] xtensa: Remove ELF_MACHINE from cpu.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Peter Crosthwaite , riku.voipio@iki.fi, Peter Crosthwaite , Max Filippov From: Peter Crosthwaite 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 Signed-off-by: Peter Crosthwaite --- 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 328d209..8bd0c22 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 ab4d0e4..ba67035 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -340,7 +340,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 96bfc82..4ec005e 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 -- 1.9.1