From patchwork Tue Jun 5 23:53:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 163222 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 20320B6F9A for ; Wed, 6 Jun 2012 11:46:13 +1000 (EST) Received: from localhost ([::1]:44540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc3bl-0001zd-D2 for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2012 19:56:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc3aC-0007wq-6H for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc3Z7-0002SO-Nc for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:54:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36446 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc3Z7-0002RS-D2; Tue, 05 Jun 2012 19:53:33 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id E455CA2BD7; Wed, 6 Jun 2012 01:53:31 +0200 (CEST) From: Alexander Graf To: "qemu-devel@nongnu.org Developers" Date: Wed, 6 Jun 2012 01:53:11 +0200 Message-Id: <1338940402-28502-21-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1338940402-28502-1-git-send-email-agraf@suse.de> References: <1338940402-28502-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: qemu-ppc Mailing List Subject: [Qemu-devel] [PATCH 20/31] PPC: e500: dt: start with empty device tree 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 Now that all of the device tree bits are generated during runtime, we can get rid of the device tree blob and instead start from scratch with an empty device tree. Signed-off-by: Alexander Graf --- Makefile | 1 - hw/ppce500_mpc8544ds.c | 8 +------- pc-bios/mpc8544ds.dtb | Bin 72 -> 0 bytes pc-bios/mpc8544ds.dts | 14 -------------- 4 files changed, 1 insertions(+), 22 deletions(-) delete mode 100644 pc-bios/mpc8544ds.dtb delete mode 100644 pc-bios/mpc8544ds.dts diff --git a/Makefile b/Makefile index 9b7a85e..6be0c94 100644 --- a/Makefile +++ b/Makefile @@ -259,7 +259,6 @@ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ qemu-icon.bmp \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ -mpc8544ds.dtb \ multiboot.bin linuxboot.bin kvmvapic.bin \ s390-zipl.rom \ spapr-rtas.bin slof.bin \ diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index d9a3d50..30683e7 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -92,7 +92,6 @@ static int mpc8544_load_device_tree(CPUPPCState *env, { int ret = -1; uint32_t mem_reg_property[] = {0, cpu_to_be32(ramsize)}; - char *filename; int fdt_size; void *fdt; uint8_t hypercall[16]; @@ -113,12 +112,7 @@ static int mpc8544_load_device_tree(CPUPPCState *env, 0x20000000, 0x1000000, 0x0, 0x0, 0xe1000000, 0x0, 0x10000 }; - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); - if (!filename) { - goto out; - } - fdt = load_device_tree(filename, &fdt_size); - g_free(filename); + fdt = create_device_tree(&fdt_size); if (fdt == NULL) { goto out; } diff --git a/pc-bios/mpc8544ds.dtb b/pc-bios/mpc8544ds.dtb deleted file mode 100644 index 90ef5c00243b04f4aa3f812b89d5b37c63be09f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 mcmcb>`|m9S1A_+;TR>?IAT0>Q0zeD{$ZVJxBb31eq&Wct_yhI; diff --git a/pc-bios/mpc8544ds.dts b/pc-bios/mpc8544ds.dts deleted file mode 100644 index 16aba2b..0000000 --- a/pc-bios/mpc8544ds.dts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * MPC8544 DS Device Tree Source - * - * Copyright 2007, 2008 Freescale Semiconductor Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -/dts-v1/; -/ { -};