From patchwork Wed Jun 3 07:01:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 479781 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 8BF2314029E for ; Wed, 3 Jun 2015 17:03:06 +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=Hv6cS0Uu; dkim-atps=neutral Received: from localhost ([::1]:33735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z02hc-0001i8-9X for incoming@patchwork.ozlabs.org; Wed, 03 Jun 2015 03:03:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z02gS-0007eQ-F6 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 03:01:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z02gN-0000yz-DF for qemu-devel@nongnu.org; Wed, 03 Jun 2015 03:01:52 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:34935) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z02gN-0000yL-6r for qemu-devel@nongnu.org; Wed, 03 Jun 2015 03:01:47 -0400 Received: by padjw17 with SMTP id jw17so900449pad.2 for ; Wed, 03 Jun 2015 00:01:46 -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=PAIT4fjKQu+w8ldX5/a52Y1cs5HHrQ+N/sVYGni+Am4=; b=Hv6cS0Uuh213D84RgvazXM+bz47DFo3noK7MdIRgE8EV0XG94Xbb4ofRr9NrFyUDpn D+kvBlMh20GGEd/WXJjr8DWaDgP1/+EdZ1jkM2C7zEIXIdHhmu/e1FnmuHWXo+ykip10 6d3xNMI8C+kktjoaAu8p2QPDdC9kjMbliV1vpVDjpEeKSbrL5KW3jAFGu5W/Io/Vzkye kzWFPX4CCj8mreAU1+iergFxLWjWQ84spwkMCpWSv2Su7hph5P2t1vW+DiGPhbCkNGcD KRcra7/yrIWq/ecVGS38dFkvW08byK8MdETmTIGJpaiDBKcTLbZHDlmdq93tRnfyqWTH Y6Lw== X-Received: by 10.70.101.200 with SMTP id fi8mr292846pdb.161.1433314906529; Wed, 03 Jun 2015 00:01:46 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id ht10sm19874027pdb.41.2015.06.03.00.01.45 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 00:01:46 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com Date: Wed, 3 Jun 2015 17:01:11 +1000 Message-Id: <4f6bd6c109a2f732cfe767cb54ede06ed7568845.1433314301.git.alistair.francis@xilinx.com> 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:400e:c03::22c Cc: peter.crosthwaite@xilinx.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v1 7/8] 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 --- 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 = {