From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksi-0006dW-QE for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksh-0000b3-K6 for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:56 -0400 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:34330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksh-0000as-Do for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:55 -0400 Received: by paccq16 with SMTP id cq16so38650615pac.1 for ; Sat, 15 Aug 2015 16:28:54 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 15 Aug 2015 16:28:21 -0700 Message-Id: <55f8a6b84e2434a11c3c8bdecc3f9f5c417a3f77.1439679104.git.crosthwaite.peter@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 11/19] tricore: 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 , Bastian Koppelmann From: Peter Crosthwaite The bootloader can just pass EM_TRICORE directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Bastian Koppelmann Signed-off-by: Peter Crosthwaite --- hw/tricore/tricore_testboard.c | 2 +- target-tricore/cpu.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index a059a20..62b406b 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -44,7 +44,7 @@ static void tricore_load_kernel(CPUTriCoreState *env) kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL, NULL, (uint64_t *)&entry, NULL, NULL, 0, - ELF_MACHINE, 1); + EM_TRICORE, 1); if (kernel_size <= 0) { error_report("qemu: no kernel file '%s'", tricoretb_binfo.kernel_filename); diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h index 916ee27..a72a7d8 100644 --- a/target-tricore/cpu.h +++ b/target-tricore/cpu.h @@ -25,8 +25,6 @@ #include "exec/cpu-defs.h" #include "fpu/softfloat.h" -#define ELF_MACHINE EM_TRICORE - #define CPUArchState struct CPUTriCoreState struct CPUTriCoreState; -- 1.9.1