From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Peter Crosthwaite Date: Sun, 10 May 2015 23:29:37 -0700 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [RFC PATCH 34/34] HACK: mb: boot: Disable dtb load in multi-arch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, edgari@xilinx.com, sorenb@xilinx.com, afaerber@suse.de, rth@twiddle.net 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); } -- 1.9.1