From patchwork Fri Jun 5 06:43:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 481051 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 0F4A314028F for ; Fri, 5 Jun 2015 16:45:00 +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=IQvVbDlI; dkim-atps=neutral Received: from localhost ([::1]:45502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0lNC-0007IK-3q for incoming@patchwork.ozlabs.org; Fri, 05 Jun 2015 02:44:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0lMp-0006gG-JE for qemu-devel@nongnu.org; Fri, 05 Jun 2015 02:44:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0lMl-0006re-8u for qemu-devel@nongnu.org; Fri, 05 Jun 2015 02:44:35 -0400 Received: from mail-oi0-x22e.google.com ([2607:f8b0:4003:c06::22e]:33308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0lMl-0006ra-4y for qemu-devel@nongnu.org; Fri, 05 Jun 2015 02:44:31 -0400 Received: by oiww2 with SMTP id w2so47564809oiw.0 for ; Thu, 04 Jun 2015 23:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GkCReZa3hwQNbJEDJ/a6PGivv3j09mr2MXEKcDTV/T4=; b=IQvVbDlIp6T8z0Bg36YQclHGO70rK4nBbLL7x78JnTnN/j1KIJcr29fTUml3pyrN66 asfNl6s3RbWQqkuXkuJt5KXaieFcVkdKWT3f1ZRQL+Ce2SB/K+WSRUk7c0pMsPO0tJLM JiLhOdOtNAwu1jxMUdQo9w0ODEseIqe/3DLPt0o/Td8zl/WqsBYYm7qk3eW2X3oqh+/z +XSietYdPvyAPParTrdo3rWkPjNpkfUjoxx6s9B1Ule3etffuXFJlopZCiaJ0kV/iqnT lPvfuVPol281c/0AUsHLwBSrBPlg9QMmUyfc5giDspChJk8/NyBCNtY4pjTsWdTPculG nS5Q== X-Received: by 10.202.226.196 with SMTP id z187mr1572593oig.128.1433486670655; Thu, 04 Jun 2015 23:44:30 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id d70sm3002379oih.16.2015.06.04.23.44.29 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 04 Jun 2015 23:44:30 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com Date: Fri, 5 Jun 2015 16:43:55 +1000 Message-Id: X-Mailer: git-send-email 2.1.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c06::22e Cc: peter.crosthwaite@xilinx.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v2 8/9] s3adsp1800: Remove the hardcoded values from the reset 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 Remove the hardcoded values from the machine specific reset function, as the same values are already set in the standard MicroBlaze reset. This also allows the entire reset function to be deleted, as PVR registers are now preserved on reset. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Peter Crosthwaite --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 84f6e74..7109e63 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -51,13 +51,6 @@ #define ETHLITE_IRQ 1 #define UARTLITE_IRQ 3 -static void machine_cpu_reset(MicroBlazeCPU *cpu) -{ - CPUMBState *env = &cpu->env; - - env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family. */ -} - static void petalogix_s3adsp1800_init(MachineState *machine) { @@ -132,7 +125,7 @@ petalogix_s3adsp1800_init(MachineState *machine) microblaze_load_kernel(cpu, ddr_base, ram_size, machine->initrd_filename, BINARY_DEVICE_TREE_FILE, - machine_cpu_reset); + NULL); } static QEMUMachine petalogix_s3adsp1800_machine = {