From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Peter Crosthwaite Date: Mon, 23 Mar 2015 04:05:18 -0700 Message-ID: <8f036aa5e8b618bcce048c1ca9ce629ec49aad31.1427108387.git.peter.crosthwaite@xilinx.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH target-arm v4 15/16] arm: xilinx-ep108: Add bootloading List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, ozaki.ryota@gmail.com, michals@xilinx.com, zach.pfeffer@xilinx.com Using standard ARM bootloader. Signed-off-by: Peter Crosthwaite --- 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 = { -- 2.3.1.2.g90df61e.dirty