From patchwork Mon May 11 06:29:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 470611 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 EFDE3140079 for ; Mon, 11 May 2015 16:34:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=gDxkIxdf; dkim-atps=neutral Received: from localhost ([::1]:35569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrhIk-0000xl-7H for incoming@patchwork.ozlabs.org; Mon, 11 May 2015 02:34:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrhI5-0008Dq-RH for qemu-devel@nongnu.org; Mon, 11 May 2015 02:34:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrhEn-0003SK-9Z for qemu-devel@nongnu.org; Mon, 11 May 2015 02:30:52 -0400 Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:33126) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrhEn-0003SE-27 for qemu-devel@nongnu.org; Mon, 11 May 2015 02:30:49 -0400 Received: by pdbnk13 with SMTP id nk13so138847732pdb.0 for ; Sun, 10 May 2015 23:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=EkokgdBeR8xoCg68TlAPQaTD+eMNGCPakZaQqZU/Xxs=; b=gDxkIxdfr1HubsfGCLcZAty44woF+SQGJ1tbLlpFocliMcqP4bYujaJV/bLzXa9UX6 wfuIeOGDtPtsL8ObcKzbOPB76gx07b2fvgrLZ78TuOX0LrzhJi+5nFmc7c61k5VxJc0/ iF6r8kvSlqK+oIbUsdqvkK9isy3strFLYy2hiQOjNP0uQXOgAljqyGRW2wGYP1T+UmWm 3NlFaqvwBsWtyH0SG0upopCsCWUhOvmnGgA6oAPw+uXx1EK3qzQuB7D3ERjn4s0RNP/h ltu13Zc8sKD/Hjgx3ps1UJyQUPuSYzRPT8Rzx/iaVEgRjOAast2s51bOKkoaZqdvq7hJ jovQ== X-Received: by 10.68.125.130 with SMTP id mq2mr16422836pbb.121.1431325848434; Sun, 10 May 2015 23:30:48 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-24-5-157-48.hsd1.ca.comcast.net. [24.5.157.48]) by mx.google.com with ESMTPSA id pw9sm11935481pac.27.2015.05.10.23.30.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 May 2015 23:30:47 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sun, 10 May 2015 23:29:37 -0700 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22f Cc: peter.maydell@linaro.org, edgari@xilinx.com, sorenb@xilinx.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [RFC PATCH 34/34] HACK: mb: boot: Disable dtb load in multi-arch 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 Linux kernel booting is not yet defined for multi-arch and Microblazes DTB loader sometimes gets in the way of elfs. Just disable it for multi-arch. Signed-off-by: Peter Crosthwaite --- hw/microblaze/boot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 082238b..d6b3298 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -60,6 +60,7 @@ static void main_cpu_reset(void *opaque) } } +#ifndef TARGET_MULTI static int microblaze_load_dtb(hwaddr addr, uint32_t ramsize, uint32_t initrd_start, @@ -97,6 +98,7 @@ static int microblaze_load_dtb(hwaddr addr, cpu_physical_memory_write(addr, fdt, fdt_size); return fdt_size; } +#endif static uint64_t translate_kernel_address(void *opaque, uint64_t addr) { @@ -203,12 +205,14 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, } /* Provide a device-tree. */ boot_info.fdt = boot_info.cmdline + 4096; +#ifndef TARGET_MULTI microblaze_load_dtb(boot_info.fdt, ram_size, boot_info.initrd_start, boot_info.initrd_end, kernel_cmdline, /* Preference a -dtb argument */ dtb_arg ? dtb_arg : filename); +#endif } g_free(filename); }