From patchwork Fri Apr 24 19:31:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 464389 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 A470D140079 for ; Sat, 25 Apr 2015 05:36:50 +1000 (AEST) Received: from localhost ([::1]:46216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YljP6-0002Ql-QY for incoming@patchwork.ozlabs.org; Fri, 24 Apr 2015 15:36:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YljK4-0002LA-Up for qemu-devel@nongnu.org; Fri, 24 Apr 2015 15:31:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YljK1-0007jY-Nr for qemu-devel@nongnu.org; Fri, 24 Apr 2015 15:31:36 -0400 Received: from mail-bl2on0073.outbound.protection.outlook.com ([65.55.169.73]:13202 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YljK1-0007jM-KC for qemu-devel@nongnu.org; Fri, 24 Apr 2015 15:31:33 -0400 Received: from BL2FFO11OLC011.protection.gbl (10.173.160.32) by BL2FFO11HUB026.protection.gbl (10.173.161.50) with Microsoft SMTP Server (TLS) id 15.1.154.14; Fri, 24 Apr 2015 19:31:32 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BL2FFO11OLC011.mail.protection.outlook.com (10.173.160.157) with Microsoft SMTP Server (TLS) id 15.1.154.14 via Frontend Transport; Fri, 24 Apr 2015 19:31:32 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:51909 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1YljFG-0001n3-1g; Fri, 24 Apr 2015 12:26:38 -0700 Received: from [127.0.0.1] (port=33538 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1YljJy-0001HJ-Vi; Fri, 24 Apr 2015 12:31:31 -0700 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id t3OJRRsZ005385; Fri, 24 Apr 2015 12:27:27 -0700 Received: from [172.19.74.49] (port=38258 helo=xsjsorenbubuntu.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1YljJy-0001H5-50; Fri, 24 Apr 2015 12:31:30 -0700 From: Peter Crosthwaite To: Date: Fri, 24 Apr 2015 12:31:30 -0700 Message-ID: <8090b0fe50059f3ad44124406fa9e62e8a0e6c7a.1429903602.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 2.3.6.3.g2cc70ee In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-7.5.0.1018-21500.005 X-TM-AS-Result: No--6.497-7.0-31-10 X-imss-scan-details: No--6.497-7.0-31-10 X-TMASE-MatchedRID: k8Cd32tj8sEBJNtQGs9jFGNW0DAjL5p+2MmowBCx0sFb6PBUqmq+Uj2i lXOHbsGlbaFo1bdWCGYSLhTDFuJA+SGlT4FPpKFRiBA/0bBQLmvljSRvSGpq3LDOZkvqV9x1o8W MkQWv6iXBcIE78YqRWo6HM5rqDwqt0/4BT/YzHNYS0KokGI1eZINwFvWNE8fUSfkVnRpTZs/4XS 4RnKED0g== X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(199003)(189002)(2351001)(229853001)(110136001)(71366001)(105606002)(48376002)(6806004)(19580405001)(64026002)(86362001)(36756003)(47776003)(85426001)(87936001)(50226001)(77096005)(92566002)(2950100001)(46102003)(62966003)(77156002)(118296001)(106466001)(19580395003)(50466002)(33646002)(50986999)(76176999)(107986001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2FFO11HUB026; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2FFO11HUB026; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5002010)(5005006)(3002001); SRVR:BL2FFO11HUB026; BCL:0; PCL:0; RULEID:; SRVR:BL2FFO11HUB026; X-Forefront-PRVS: 05568D1FF7 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2015 19:31:32.0987 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2FFO11HUB026 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 65.55.169.73 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, zach.pfeffer@xilinx.com, jues@xilinx.com, ozaki.ryota@gmail.com, Alistair Francis , michals@xilinx.com Subject: [Qemu-devel] [PATCH target-arm v5 14/14] arm: xilinx-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add bootloader support using standard ARM bootloader. Reviewed-by: Alistair Francis Tested-by: Alistair Francis Signed-off-by: Peter Crosthwaite --- changed since v4: Add loader_start field Make commit message body standalone. 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 = {