From patchwork Sat Aug 15 23:28:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 507665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C922914012C for ; Sun, 16 Aug 2015 09:37:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=gogkfm+E; dkim-atps=neutral Received: from localhost ([::1]:51087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQl19-0006Nd-0I for incoming@patchwork.ozlabs.org; Sat, 15 Aug 2015 19:37:39 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=YWleMMQk1AMG3bT+jK1efB99p8JHP2z9rR/Gl7aaYrs=; b=gogkfm+EcRqOm5pZrT5CpX2QYL4JWGVPXU6CCq9IbkZSo+B8IowFrBR+4PGjdpJ2nK Q4HCUF4TRdHojfHutT4MlgF+A6JlCL9Fq5nGSJLxWc3AzJGmAlUSHJ8oHdpxhZxJeFyP rLLlyyrAXBfuDdRn6aemMqbY46DadW4dxCpIs/TnpW6GbSG3B943XQtxV2XI2w9ciGNb mR8GeOE8BjGsS1QSzO8ezVrVn0DECfvPFXNXhr3Gepj2MAN/pySNC4cO/wWr4ksKWPSs tZhNv8Z0fJHCnBMPPEw99WUmW2JLAhNPKqle6AaL6wspD6h/7l9bBpN3+X0LSbePi9A4 f2Gg== X-Received: by 10.68.206.103 with SMTP id ln7mr100887701pbc.37.1439681334807; Sat, 15 Aug 2015 16:28:54 -0700 (PDT) Received: from pcrost-box.hsd1.ca.comcast.net (c-50-168-24-48.hsd1.ca.comcast.net. [50.168.24.48]) by smtp.gmail.com with ESMTPSA id q6sm9863304pdp.14.2015.08.15.16.28.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Aug 2015 16:28:53 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sat, 15 Aug 2015 16:28:21 -0700 Message-Id: <55f8a6b84e2434a11c3c8bdecc3f9f5c417a3f77.1439679104.git.crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22f Cc: pbonzini@redhat.com, Peter Crosthwaite , riku.voipio@iki.fi, Peter Crosthwaite , Bastian Koppelmann Subject: [Qemu-devel] [PATCH 11/19] tricore: Remove ELF_MACHINE from cpu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-By: Bastian Koppelmann --- 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;