From patchwork Mon Mar 23 11:05:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 453370 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 88153140134 for ; Mon, 23 Mar 2015 22:12:56 +1100 (AEDT) Received: from localhost ([::1]:54983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya0Hu-0002ZK-LU for incoming@patchwork.ozlabs.org; Mon, 23 Mar 2015 07:12:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya0Ag-0007NR-JW for qemu-devel@nongnu.org; Mon, 23 Mar 2015 07:05:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ya0Ac-00075G-22 for qemu-devel@nongnu.org; Mon, 23 Mar 2015 07:05:26 -0400 Received: from mail-bl2on0093.outbound.protection.outlook.com ([65.55.169.93]:35584 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya0Ab-000758-UO for qemu-devel@nongnu.org; Mon, 23 Mar 2015 07:05:22 -0400 Received: from BN1AFFO11FD043.protection.gbl (10.58.52.31) by BN1AFFO11HUB030.protection.gbl (10.58.52.140) with Microsoft SMTP Server (TLS) id 15.1.125.13; Mon, 23 Mar 2015 11:05:21 +0000 Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BN1AFFO11FD043.mail.protection.outlook.com (10.58.52.190) with Microsoft SMTP Server (TLS) id 15.1.125.13 via Frontend Transport; Mon, 23 Mar 2015 11:05:20 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:45618 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1Ya06M-0006EE-8g; Mon, 23 Mar 2015 04:00:58 -0700 Received: from [127.0.0.1] (port=43190 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1Ya0AZ-0006dD-Op; Mon, 23 Mar 2015 04:05:19 -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 t2NB1RNF014916; Mon, 23 Mar 2015 04:01:27 -0700 Received: from [172.19.74.49] (port=60787 helo=xsjsorenbubuntu.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1Ya0AY-0006d0-Sx; Mon, 23 Mar 2015 04:05:18 -0700 From: Peter Crosthwaite To: Date: Mon, 23 Mar 2015 04:05:18 -0700 Message-ID: <8f036aa5e8b618bcce048c1ca9ce629ec49aad31.1427108387.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 2.3.1.2.g90df61e.dirty 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-21418.005 X-TM-AS-Result: No--6.377-7.0-31-10 X-imss-scan-details: No--6.377-7.0-31-10 X-TMASE-MatchedRID: HqLbaOcAL5qKfuODkuzgfAPZZctd3P4Bh+w9Wz/xXDoKogmGusPLbyQu bRlVZ8/TKYfvWTF/ooF6gOO8TMrEQjEV1fJb8/5dGVyS87Wb4lx9LQinZ4QefPcjNeVeWlqY+gt Hj7OwNO0kL2NLniq3NXfTHFK/duRgHFCIONuglAYBR9qgFb6WecO/fEOLpjnx X-EOPAttributedMessage: 0 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; Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=peter.crosthwaite@xilinx.com; gmail.com; dkim=none (message not signed) header.d=none; X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(189002)(199003)(62966003)(85426001)(77156002)(47776003)(87936001)(71366001)(33646002)(77096005)(76176999)(19580395003)(6806004)(50986999)(64026002)(19580405001)(86362001)(118296001)(92566002)(50226001)(2950100001)(110136001)(50466002)(2351001)(46102003)(106466001)(48376002)(229853001)(105606002)(36756003)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1AFFO11HUB030; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1AFFO11HUB030; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5002010)(5005006); SRVR:BN1AFFO11HUB030; BCL:0; PCL:0; RULEID:; SRVR:BN1AFFO11HUB030; X-Forefront-PRVS: 05245CA661 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2015 11:05:20.6039 (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: BN1AFFO11HUB030 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 65.55.169.93 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, ozaki.ryota@gmail.com, michals@xilinx.com, zach.pfeffer@xilinx.com Subject: [Qemu-devel] [PATCH target-arm v4 15/16] 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 Using standard ARM bootloader. Signed-off-by: Peter Crosthwaite Reviewed-by: Alistair Francis --- hw/arm/xlnx-ep108.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index 6e89456..a86f595 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); @@ -58,6 +60,12 @@ static void xlnx_ep108_init(MachineState *machine) &error_abort); vmstate_register_ram_global(&s->ddr_ram); 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; + arm_load_kernel(&s->soc.cpu[0], &xlnx_ep108_binfo); } static QEMUMachine xlnx_ep108_machine = {