From patchwork Sat Aug 15 23:28:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 507661 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 4837314012C for ; Sun, 16 Aug 2015 09:34:47 +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=hHMTlFpu; dkim-atps=neutral Received: from localhost ([::1]:51061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQkyL-0001TJ-55 for incoming@patchwork.ozlabs.org; Sat, 15 Aug 2015 19:34:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksd-0006S1-Fj for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksc-0000Z0-Fb for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:51 -0400 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:34328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksc-0000Yr-9Q for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:50 -0400 Received: by paccq16 with SMTP id cq16so38649895pac.1 for ; Sat, 15 Aug 2015 16:28:49 -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=iZyGMAclu1cqbYBmVMU7rIcIoRlo0s/Py5gR9Z/ik64=; b=hHMTlFpuCHYyBQIISqBZAv9lUMasRPiOLVBLwVQCorbVhwRQkRL3LrQv6jnsk/rXx2 3lnXcGM+oUTUVPBKP1nGd96d1nAOtdrdqs7mMBor8YNnOPo4jq4P5xxJx/1nktgVBrHl BvPHUeKuUM/26ydBiDu8BB/z9YoZofWM4jz5PfUh+FMiekbBwqnP8zJO2yPutHsrGwdw V2OQY2okWY8hYXS4fAD7ltjP7SgDtRDy4oLaDs9YllapiZjoPcTQ35F0tbjIIu5YPhgH Q7GjBmmPNgb/C+c/csu8BRPxu3vdV8JCTr1Aq8kDj+Y1Hb4vyt3ciHbm8ymu2QTS0v0y 31Dw== X-Received: by 10.66.138.16 with SMTP id qm16mr104768071pab.29.1439681329690; Sat, 15 Aug 2015 16:28:49 -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.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Aug 2015 16:28:48 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sat, 15 Aug 2015 16:28:17 -0700 Message-Id: <768872ab4c5c5df9922240dae3e4f853adcf5c56.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::22b Cc: pbonzini@redhat.com, Peter Crosthwaite , riku.voipio@iki.fi, Anthony Green , Peter Crosthwaite Subject: [Qemu-devel] [PATCH 07/19] moxie: 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_MOXIE directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Anthony Green Signed-off-by: Peter Crosthwaite --- hw/moxie/moxiesim.c | 2 +- target-moxie/cpu.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 80bcc5b..c3697c6 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -53,7 +53,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL, &entry, &kernel_low, &kernel_high, 1, - ELF_MACHINE, 0); + 0xFEED /* EM_MOXIE */, 0); if (kernel_size <= 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index 29572aa..e27a6a3 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -26,8 +26,6 @@ #define CPUArchState struct CPUMoxieState -#define ELF_MACHINE 0xFEED /* EM_MOXIE */ - #define MOXIE_EX_DIV0 0 #define MOXIE_EX_BAD 1 #define MOXIE_EX_IRQ 2