From patchwork Tue Apr 3 06:17:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 150328 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7474AB6FE0 for ; Tue, 3 Apr 2012 16:18:08 +1000 (EST) Received: from localhost ([::1]:59349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEx4A-00037r-98 for incoming@patchwork.ozlabs.org; Tue, 03 Apr 2012 02:18:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEx3k-0002BQ-Hh for qemu-devel@nongnu.org; Tue, 03 Apr 2012 02:17:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEx3i-0000o8-Lc for qemu-devel@nongnu.org; Tue, 03 Apr 2012 02:17:40 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:39340) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEx3i-0000mK-FL for qemu-devel@nongnu.org; Tue, 03 Apr 2012 02:17:38 -0400 Received: by mail-pz0-f46.google.com with SMTP id z9so3866534dad.33 for ; Mon, 02 Apr 2012 23:17:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=6Irwxb2jWhtx17g6YZNodzveC9G9V9C3Sqjgk7u0UnM=; b=UV4OsyAxY4U3RAmcPMTpgUAoNIhZYOCmOM7bUMgFTHKGXbO/aCWH68Bc/v5ZnhfO65 aTLyR+DTvkadDJ9xCBD05zN9sS6iv+5uiv5PCORq/xIYBqp9QI1TZWzUjTq2QrNX9Mhc /9ZBxldWUE08zHv5E5pu3LZzyTkhb/hFrBufB+qm0nuQ+zV2lUTz1QZxQ9a8QkkngbJQ PIfi6NZOFafrWVC6g7igCGLgW4A5elANVnBnzW8TdD6ZLmWUCVdvwYkDM4A7g3ZZZuBm M4JEPmzT1fVLuUZkOpPIJmdOn1VlyLKkKh+k1jqAmpuOTOsUUDE2vHKBKtBWpgG8uckH mhuA== Received: by 10.68.193.170 with SMTP id hp10mr7404145pbc.65.1333433857475; Mon, 02 Apr 2012 23:17:37 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id t7sm6288324pbp.15.2012.04.02.23.17.32 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Apr 2012 23:17:36 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: peter.crosthwaite@petalogix.com, peter.maydell@linaro.org, qemu-devel@nongnu.org, edgar.iglesias@gmail.com, i.mitsyanko@samsung.com Date: Tue, 3 Apr 2012 16:17:30 +1000 Message-Id: X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQm4ynewYX1Mga00F/WMRMSSQQJimjkYzgH+fJiTh2GEmII1O0mlZTwGD6gBEXRDMXT2LwTY X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.46 Cc: kwolf@redhat.com, vpalatin@chromium.org, d.solodkiy@samsung.com, duyl@xilinx.com, linnj@xilinx.com, john.williams@petalogix.com, paul@codesourcery.com Subject: [Qemu-devel] [PATCH v2 2/2] xilinx_zynq: added sdhci controller 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 Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx_zynq.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 31d9e81..e92ebe0 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -161,6 +161,18 @@ static void zynq_init(ram_addr_t ram_size, const char *boot_device, sysbus_create_varargs("cadence_ttc", 0xF8002000, pic[69-IRQ_OFFSET], pic[70-IRQ_OFFSET], pic[71-IRQ_OFFSET], NULL); + dev = qdev_create(NULL, "sysbus_sdhci"); + dinfo = drive_get(IF_SD, 0, 0); + if (dinfo) { + if (qdev_prop_set_drive(dev, "block", dinfo ? dinfo->bdrv : NULL)) { + fprintf(stderr, "ZYNQ: ERROR: bad sd data file specified\n"); + } + } + qdev_init_nofail(dev); + busdev = sysbus_from_qdev(dev); + sysbus_mmio_map(busdev, 0, 0xE0100000); + sysbus_connect_irq(busdev, 0, pic[56-IRQ_OFFSET]); + for (n = 0; n < nb_nics; n++) { nd = &nd_table[n]; if (n == 0) { @@ -190,7 +202,6 @@ static QEMUMachine zynq_machine = { .init = zynq_init, .use_scsi = 1, .max_cpus = 2, - .no_sdcard = 1 }; static void zynq_machine_init(void)