From patchwork Fri May 24 15:26:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 17206 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CA3402397B for ; Fri, 24 May 2013 15:28:06 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id cz11sf6052871veb.10 for ; Fri, 24 May 2013 08:27:09 -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=+MqYNp0dX5/eJQOlCq5IzxEiBq04/3ZBvImJhTawEFo=; b=cUvtw7WEM63y/aQX85Xn68VeeJArQa2exZnxufGjR10y9wSSIyrHwFrVjmy+36QFAt 69i+9cjuYuFi8z5QSnjbg/4eDSi6Dv1ao34ZvujDGfU+woZHe0fCqAYSY0BSt9HZf6/Z qDmyag2FlyPCQCtBzIFiyqA13A/m4B4iBJqUFn1hAqJQQhZwb046M68C37rAxnXc2snA 39/NWQRQhTqX05CYYqF0SG3kOkg2ae+A5M03498uz0a1NLtKXyhW0iI8rZumPR5wdVIX FyQ+q+dOrVq3e/WuFdlHVOl2tn/9BwShyCzCh/5n4kdGBLkGr4X8ayabcrz8QVTUcsa7 eKUA== X-Received: by 10.236.46.50 with SMTP id q38mr8162291yhb.44.1369409229110; Fri, 24 May 2013 08:27:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.69 with SMTP id 5ls736063qek.92.gmail; Fri, 24 May 2013 08:27:08 -0700 (PDT) X-Received: by 10.220.76.137 with SMTP id c9mr8807718vck.48.1369409228842; Fri, 24 May 2013 08:27:08 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id p19si9748111vcw.89.2013.05.24.08.27.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 08:27:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id m17so3274206vca.30 for ; Fri, 24 May 2013 08:27:08 -0700 (PDT) X-Received: by 10.220.92.195 with SMTP id s3mr8966862vcm.9.1369409228658; Fri, 24 May 2013 08:27:08 -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 c10csp106823vcs; Fri, 24 May 2013 08:27:08 -0700 (PDT) X-Received: by 10.68.8.232 with SMTP id u8mr18803864pba.184.1369409224289; Fri, 24 May 2013 08:27:04 -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 ln2si13157464pab.141.2013.05.24.08.27.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 08:27:03 -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-0001yK-HY; 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 2/4] arm: Remove CONFIG_FDT conditionals Date: Fri, 24 May 2013 16:26:55 +0100 Message-Id: <1369409217-7553-3-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: ALoCoQnod65QN/cXAqlqoskMjepVDqhtVjwczpkkzOgGcjTQo3pL3XW0DTKBEai87JQcNO6C8vQI X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 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 Reviewed-by: Peter Crosthwaite --- hw/arm/boot.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index f451529..defcf15 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -227,7 +227,6 @@ static void set_kernel_args_old(const struct arm_boot_info *info) static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) { -#ifdef CONFIG_FDT uint32_t *mem_reg_property; uint32_t mem_reg_propsize; void *fdt = NULL; @@ -308,12 +307,6 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) cpu_physical_memory_write(addr, fdt, size); return 0; - -#else - fprintf(stderr, "Device tree requested, " - "but qemu was compiled without fdt support\n"); - return -1; -#endif } static void do_cpu_reset(void *opaque)