From patchwork Fri Sep 11 05:44:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 516603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8079F140271 for ; Fri, 11 Sep 2015 16:04:55 +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=vzk6gylw; dkim-atps=neutral Received: from localhost ([::1]:54221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaHS9-0002ZU-O9 for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2015 02:04:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaH9F-0008Gs-F6 for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaH9B-0008GU-Vo for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:45:21 -0400 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:34744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaH9B-0008GI-NA for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:45:17 -0400 Received: by padhy16 with SMTP id hy16so64855232pad.1 for ; Thu, 10 Sep 2015 22:45:17 -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=ukG4B3ssZz9yV+ZDaspqA+fMM4LijpIcvAvbK4hdPsQ=; b=vzk6gylwjXVu2P8Us7GvUgRZ07IOP/RhLOjDhfhf/OzjtrynXzNU2IQI5fWBSfHki/ 4N9rSEk4ZaBtbGbdpu5CzPEx+5OEoddxhBR5cRs5Y5DTQ2xUHRe21j7OqA0vuskHB6D1 dXgmtdr/pIMChpgXdl6z0sVLxB0oP3qA/vt46RKV3fg6rnq9T7UJt9ZUSII/6omQj18B X9o2zFwSttEaVjwgZb10KADeLmzt5TnzUmLhX/cSDaPQq+Isxo2kvUQO0eB0WO0xrRP1 GfVgvdQpPXN8rNDwlhgSsG2Zn3h+dSaWCngVweMFP7uu9T1FgfRxnzC88MBTQAHH1+Up SdQg== X-Received: by 10.68.229.195 with SMTP id ss3mr91645201pbc.100.1441950317046; Thu, 10 Sep 2015 22:45:17 -0700 (PDT) Received: from localhost.localdomain (mobile-166-171-248-052.mycingular.net. [166.171.248.52]) by smtp.gmail.com with ESMTPSA id lg7sm15385993pbc.1.2015.09.10.22.45.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Sep 2015 22:45:16 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2015 22:44:31 -0700 Message-Id: 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::232 Cc: pbonzini@redhat.com, Peter Crosthwaite , Peter Crosthwaite , Anthony Green , peter.maydell@linaro.org Subject: [Qemu-devel] [PULL v1 09/21] 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 Reviewed-by: Richard Henderson Acked-By: Riku Voipio Signed-off-by: Peter Crosthwaite --- Changed since V1 Use EM_MOXIE macro (rth) review hw/moxie/moxiesim.c | 3 +-- target-moxie/cpu.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 537e25e..83b45f1 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -53,8 +53,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) ram_addr_t initrd_offset; kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL, - &entry, &kernel_low, &kernel_high, 1, - ELF_MACHINE, 0); + &entry, &kernel_low, &kernel_high, 1, 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 7bb1ed9..e27a6a3 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -26,8 +26,6 @@ #define CPUArchState struct CPUMoxieState -#define ELF_MACHINE EM_MOXIE - #define MOXIE_EX_DIV0 0 #define MOXIE_EX_BAD 1 #define MOXIE_EX_IRQ 2