From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1J3jP6-0001MF-0Y for qemu-devel@nongnu.org; Sat, 15 Dec 2007 21:38:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1J3jP1-0001KA-82 for qemu-devel@nongnu.org; Sat, 15 Dec 2007 21:38:55 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1J3jP0-0001Jy-Lg for qemu-devel@nongnu.org; Sat, 15 Dec 2007 21:38:50 -0500 Received: from gateway-1237.mvista.com ([63.81.120.158]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1J3jOw-0004eD-3b for qemu-devel@nongnu.org; Sat, 15 Dec 2007 21:38:50 -0500 Received: from pahoa.hi.kama-aina.net (unknown [10.235.20.2]) by hermes.mvista.com (Postfix) with ESMTP id C6F511ED99 for ; Sat, 15 Dec 2007 18:38:29 -0800 (PST) Message-ID: <47648FA5.7080805@kama-aina.net> Date: Sat, 15 Dec 2007 16:38:29 -1000 From: Armin MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030704000704040800070806" Subject: [Qemu-devel] [Patch 2/2] switch support, Mainstone - resend Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------030704000704040800070806 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Here is the use of the switches patch on a Mainstone. -Armin --------------030704000704040800070806 Content-Type: text/x-patch; name="mst_switches.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mst_switches.patch" Index: qemu/hw/mainstone.c =================================================================== --- qemu.orig/hw/mainstone.c +++ qemu/hw/mainstone.c @@ -51,32 +51,28 @@ static void mainstone_common_init(int ra /* There are two 32MiB flash devices on the board */ index = drive_get_index(IF_PFLASH, 0, 0); if (index == -1) { - fprintf(stderr, "Two flash images must be given with the " + fprintf(stderr, "One flash image must be given with the " "'pflash' parameter\n"); exit(1); } - if (!pflash_cfi01_register(MST_FLASH_0, - mainstone_ram + PXA2XX_INTERNAL_SIZE, - drives_table[index].bdrv, - 256 * 1024, 128, 4, 0, 0, 0, 0)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); - exit(1); - } - index = drive_get_index(IF_PFLASH, 0, 1); - if (index == -1) { - fprintf(stderr, "Two flash images must be given with the " - "'pflash' parameter\n"); - exit(1); - } - if (!pflash_cfi01_register(MST_FLASH_1, - mainstone_ram + PXA2XX_INTERNAL_SIZE, - drives_table[index].bdrv, - 256 * 1024, 128, 4, 0, 0, 0, 0)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); - exit(1); + if(switch_get_value(CFG_SPDT_SWITCH, 7)) { + if (!pflash_cfi01_register(MST_FLASH_0, + mainstone_ram + PXA2XX_INTERNAL_SIZE, + drives_table[index].bdrv, + 256 * 1024, 128, 4, 0, 0, 0, 0)) { + fprintf(stderr, "qemu: Error registering flash memory.\n"); + exit(1); + } + }else{ + if (!pflash_cfi01_register(MST_FLASH_1, + mainstone_ram + PXA2XX_INTERNAL_SIZE, + drives_table[index].bdrv, + 256 * 1024, 128, 4, 0, 0, 0, 0)) { + fprintf(stderr, "qemu: Error registering flash memory.\n"); + exit(1); + } } - mst_irq = mst_irq_init(cpu, MST_FPGA_PHYS, PXA2XX_PIC_GPIO_0); /* MMC/SD host */ --------------030704000704040800070806--