From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnVOM-0006my-EM for qemu-devel@nongnu.org; Fri, 14 Jun 2013 10:54:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnVOG-0006wh-99 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 10:54:18 -0400 Received: from 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]:57990 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnVOG-0006wb-3M for qemu-devel@nongnu.org; Fri, 14 Jun 2013 10:54:12 -0400 From: Peter Maydell Date: Fri, 14 Jun 2013 15:53:12 +0100 Message-Id: <1371221594-11556-9-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1371221594-11556-1-git-send-email-peter.maydell@linaro.org> References: <1371221594-11556-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 08/10] arm: Remove CONFIG_FDT conditionals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Now that we know we're compiling with libfdt, we can remove the CONFIG_FDT conditionals. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Peter Crosthwaite Tested-by: Edgar E. Iglesias Message-id: 1369409217-7553-3-git-send-email-peter.maydell@linaro.org --- 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) -- 1.7.9.5