From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfuLG-0007lJ-Nf for qemu-devel@nongnu.org; Fri, 24 May 2013 11:55:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UfuL9-0001cl-CQ for qemu-devel@nongnu.org; Fri, 24 May 2013 11:55:42 -0400 From: Peter Maydell Date: Fri, 24 May 2013 16:26:55 +0100 Message-Id: <1369409217-7553-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1369409217-7553-1-git-send-email-peter.maydell@linaro.org> References: <1369409217-7553-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 2/4] arm: Remove CONFIG_FDT conditionals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , patches@linaro.org, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Peter Crosthwaite , "Edgar E. Iglesias" Now that we know we're compiling with libfdt, we can remove the CONFIG_FDT conditionals. Signed-off-by: Peter Maydell --- 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