From patchwork Mon May 18 19:15:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48707 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BE84A21411 for ; Mon, 18 May 2015 19:18:49 +0000 (UTC) Received: by wixv7 with SMTP id v7sf26819994wix.0 for ; Mon, 18 May 2015 12:18:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=uDzgnc7TyMIE/9xHvhylLCmThwISqcTTQEanbSRqcAM=; b=Y/4qso1wUXL5lMFTIX/5m2J0tXKXEtj5FQOHO2wPI7wGHfYYPzmBOp3djt/DBIa9yi BKapzyl0QSDi3VPT3rBelaDCiXBzH/XDmNsqsI8hvoiVVUtvxYHbVtPATjtVORm5Kr+2 XBkF3xLKdV7COLZ1XuPwVbPlEy/sM3Oqjpy7+QZ/TuevlSqeUX7CUShjPCpwnLz0qTcw ueC+8SgksdMUYRULgApN3A/WE9cZEP5avGn5OHTefzHwf4Gc0DwUGITTJ1nzT321L9JE qv7WwUaW6rjdMXm5mSXiOJJ8zzygwze8khtwXqXx/B6GKcuIj7m9mhGfHY7AqPjOyPvN XWTQ== X-Gm-Message-State: ALoCoQl3MwhBCmBmpsC/lecV3b1mwwkuwPOmi/sUsEDifEnbVzHm5aFfCI4E151FZ6izt6f4yFh0 X-Received: by 10.194.202.229 with SMTP id kl5mr5410928wjc.3.1431976729123; Mon, 18 May 2015 12:18:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.211 with SMTP id jq19ls828840lab.69.gmail; Mon, 18 May 2015 12:18:48 -0700 (PDT) X-Received: by 10.112.171.101 with SMTP id at5mr18979048lbc.66.1431976728964; Mon, 18 May 2015 12:18:48 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id le13si7287956lbb.27.2015.05.18.12.18.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2015 12:18:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by laat2 with SMTP id t2so233980596laa.1 for ; Mon, 18 May 2015 12:18:48 -0700 (PDT) X-Received: by 10.112.198.74 with SMTP id ja10mr18587541lbc.19.1431976728835; Mon, 18 May 2015 12:18:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp281457lbb; Mon, 18 May 2015 12:18:47 -0700 (PDT) X-Received: by 10.140.151.15 with SMTP id 15mr31367794qhx.104.1431976723807; Mon, 18 May 2015 12:18:43 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 77si493173qkx.67.2015.05.18.12.18.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 May 2015 12:18:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuQYk-0006PC-Dj for patch@linaro.org; Mon, 18 May 2015 15:18:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuQVj-0001ZC-6o for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuQVh-00007G-Dl for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:34 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuQVh-0008QT-5s for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:33 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YuQVV-0007v8-Tg for qemu-devel@nongnu.org; Mon, 18 May 2015 20:15:21 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 18 May 2015 20:15:14 +0100 Message-Id: <1431976521-30352-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431976521-30352-1-git-send-email-peter.maydell@linaro.org> References: <1431976521-30352-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 14/21] arm: xlnx-ep108: Add bootloading 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Crosthwaite Add bootloader support using standard ARM bootloader. Reviewed-by: Alistair Francis Tested-by: Alistair Francis Signed-off-by: Peter Crosthwaite Message-id: b829abaf2b70d02b28e79301553cbd74afc416a1.1431381507.git.peter.crosthwaite@xilinx.com Signed-off-by: Peter Maydell --- hw/arm/xlnx-ep108.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index 46f145b..b924f5e 100644 --- a/hw/arm/xlnx-ep108.c +++ b/hw/arm/xlnx-ep108.c @@ -28,6 +28,8 @@ typedef struct XlnxEP108 { /* Max 2GB RAM */ #define EP108_MAX_RAM_SIZE 0x80000000ull +static struct arm_boot_info xlnx_ep108_binfo; + static void xlnx_ep108_init(MachineState *machine) { XlnxEP108 *s = g_new0(XlnxEP108, 1); @@ -57,6 +59,13 @@ static void xlnx_ep108_init(MachineState *machine) memory_region_allocate_system_memory(&s->ddr_ram, NULL, "ddr-ram", machine->ram_size); memory_region_add_subregion(get_system_memory(), 0, &s->ddr_ram); + + xlnx_ep108_binfo.ram_size = machine->ram_size; + xlnx_ep108_binfo.kernel_filename = machine->kernel_filename; + xlnx_ep108_binfo.kernel_cmdline = machine->kernel_cmdline; + xlnx_ep108_binfo.initrd_filename = machine->initrd_filename; + xlnx_ep108_binfo.loader_start = 0; + arm_load_kernel(&s->soc.cpu[0], &xlnx_ep108_binfo); } static QEMUMachine xlnx_ep108_machine = {