From patchwork Fri May 24 15:26:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 17203 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CFBD7238FC for ; Fri, 24 May 2013 15:28:02 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id bv4sf5414915qab.10 for ; Fri, 24 May 2013 08:27:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=qb+K/BC6KBeP4I7sAHzFthRIF/3xmEMsn8ZhcoDCNyg=; b=O71gRMOCRBr+1H+G7LGcfW8ZpbpHKky/xmijwI9CJMVUGT4m/nsp0sptcSpy/mbGh/ V/Ou96UovVtvWwGlonpahmHHljnmzjOcB4WcdtlOaO0S2iIckKLUrCLa0QzUxwl+5Twa W3k5sMabGQ9KJDgKnhxbeRXkt8aWJYtEqW2IWjj+O9k/KmHiWqtlfWTby5Pmi1qc9LIs ZnZ2RQ3+FB2qx8cAhEiT1KZCPL1/NrxWXZcg0FBhfB+buyeZ+ici8NQJrJalpYtuhD0e B/6y8IV5GN8DBJ62GO7WviUdNlB8HvVRNjiy+Pbx67fHGeh6ZoGovm9JvcloHeMITOD/ Vtfg== X-Received: by 10.224.217.195 with SMTP id hn3mr8816973qab.5.1369409225052; Fri, 24 May 2013 08:27:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.200 with SMTP id w8ls1995792qen.1.gmail; Fri, 24 May 2013 08:27:04 -0700 (PDT) X-Received: by 10.220.103.138 with SMTP id k10mr8823397vco.74.1369409224636; Fri, 24 May 2013 08:27:04 -0700 (PDT) Received: from mail-vb0-x22c.google.com (mail-vb0-x22c.google.com [2607:f8b0:400c:c02::22c]) by mx.google.com with ESMTPS id zt2si8712192vdb.11.2013.05.24.08.27.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 08:27:04 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22c; Received: by mail-vb0-f44.google.com with SMTP id i3so1437885vbh.3 for ; Fri, 24 May 2013 08:27:04 -0700 (PDT) X-Received: by 10.52.163.207 with SMTP id yk15mr7468031vdb.42.1369409224471; Fri, 24 May 2013 08:27:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp106818vcs; Fri, 24 May 2013 08:27:03 -0700 (PDT) X-Received: by 10.204.202.199 with SMTP id ff7mr9351121bkb.121.1369409222699; Fri, 24 May 2013 08:27:02 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id cr4si253249bkc.82.2013.05.24.08.27.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 08:27:02 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UfttR-0001yO-K5; Fri, 24 May 2013 16:26:57 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , "Edgar E. Iglesias" , Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Peter Crosthwaite Subject: [PATCH 4/4] ppc: Remove CONFIG_FDT conditionals Date: Fri, 24 May 2013 16:26:57 +0100 Message-Id: <1369409217-7553-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1369409217-7553-1-git-send-email-peter.maydell@linaro.org> References: <1369409217-7553-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkwSy1s6tFt1mP+5dsZf5Ix7hOJYKxR5N6w6PlDSRb8wfXzc/H8bs6nodJ3pYzAags2I20T X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now that we know we're compiling with libfdt we can remove the CONFIG_FDT conditionals. Signed-off-by: Peter Maydell --- default-configs/ppc-softmmu.mak | 2 +- default-configs/ppc64-softmmu.mak | 4 ++-- default-configs/ppcemb-softmmu.mak | 2 +- hw/ppc/ppc440_bamboo.c | 2 -- hw/ppc/spapr_vio.c | 6 ------ hw/ppc/virtex_ml507.c | 18 ------------------ 6 files changed, 4 insertions(+), 30 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index cc3587f..bcaa52f 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -42,6 +42,6 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y -CONFIG_E500=$(CONFIG_FDT) +CONFIG_E500=y # For PReP CONFIG_MC146818RTC=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 884ea8a..8b7874e 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -42,8 +42,8 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y -CONFIG_PSERIES=$(CONFIG_FDT) -CONFIG_E500=$(CONFIG_FDT) +CONFIG_PSERIES=y +CONFIG_E500=y # For pSeries CONFIG_PCI_HOTPLUG=y # For PReP diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index be93e03..61920ff 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -37,6 +37,6 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y -CONFIG_E500=$(CONFIG_FDT) +CONFIG_E500=y # For PReP CONFIG_MC146818RTC=y diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index a55e717..b0c1c02 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -58,7 +58,6 @@ static int bamboo_load_device_tree(hwaddr addr, const char *kernel_cmdline) { int ret = -1; -#ifdef CONFIG_FDT uint32_t mem_reg_property[] = { 0, 0, cpu_to_be32(ramsize) }; char *filename; int fdt_size; @@ -115,7 +114,6 @@ static int bamboo_load_device_tree(hwaddr addr, g_free(fdt); out: -#endif return ret; } diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 1405c32..304f316 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -34,9 +34,7 @@ #include "hw/ppc/spapr_vio.h" #include "hw/ppc/xics.h" -#ifdef CONFIG_FDT #include -#endif /* CONFIG_FDT */ /* #define DEBUG_SPAPR */ @@ -94,7 +92,6 @@ VIOsPAPRDevice *spapr_vio_find_by_reg(VIOsPAPRBus *bus, uint32_t reg) return NULL; } -#ifdef CONFIG_FDT static int vio_make_devnode(VIOsPAPRDevice *dev, void *fdt) { @@ -159,7 +156,6 @@ static int vio_make_devnode(VIOsPAPRDevice *dev, return node_off; } -#endif /* CONFIG_FDT */ /* * CRQ handling @@ -570,7 +566,6 @@ static void spapr_vio_register_types(void) type_init(spapr_vio_register_types) -#ifdef CONFIG_FDT static int compare_reg(const void *p1, const void *p2) { VIOsPAPRDevice const *dev1, *dev2; @@ -655,4 +650,3 @@ int spapr_populate_chosen_stdout(void *fdt, VIOsPAPRBus *bus) return ret; } -#endif /* CONFIG_FDT */ diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 1b4ce76..709a707 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -141,7 +141,6 @@ static int xilinx_load_device_tree(hwaddr addr, { char *path; int fdt_size; -#ifdef CONFIG_FDT void *fdt; int r; @@ -162,23 +161,6 @@ static int xilinx_load_device_tree(hwaddr addr, if (r < 0) fprintf(stderr, "couldn't set /chosen/bootargs\n"); cpu_physical_memory_write(addr, fdt, fdt_size); -#else - /* We lack libfdt so we cannot manipulate the fdt. Just pass on the blob - to the kernel. */ - fdt_size = load_image_targphys("ppc.dtb", addr, 0x10000); - if (fdt_size < 0) { - path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); - if (path) { - fdt_size = load_image_targphys(path, addr, 0x10000); - g_free(path); - } - } - - if (kernel_cmdline) { - fprintf(stderr, - "Warning: missing libfdt, cannot pass cmdline to kernel!\n"); - } -#endif return fdt_size; }