From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6e5R-0007US-Rl for qemu-devel@nongnu.org; Sun, 21 Jun 2015 08:10:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z6e5K-0006Oz-H2 for qemu-devel@nongnu.org; Sun, 21 Jun 2015 08:10:57 -0400 Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]:35546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6e5K-0006Ov-Af for qemu-devel@nongnu.org; Sun, 21 Jun 2015 08:10:50 -0400 Received: by obbop1 with SMTP id op1so5027907obb.2 for ; Sun, 21 Jun 2015 05:10:50 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id t8sm6490220oex.1.2015.06.21.05.10.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 21 Jun 2015 05:10:49 -0700 (PDT) From: "Edgar E. Iglesias" Date: Sun, 21 Jun 2015 21:56:26 +1000 Message-Id: <1434887787-4188-16-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1434887787-4188-1-git-send-email-edgar.iglesias@gmail.com> References: <1434887787-4188-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v1 15/16] s3adsp1800: Remove the hardcoded values from the reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Alistair Francis 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 Signed-off-by: Edgar E. Iglesias --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 4dbbd1e..0c2140c 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) { @@ -128,7 +121,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 = { -- 1.9.1