From: Peter Maydell Date: Fri, 24 May 2013 15:26:55 +0000 (+0100) Subject: arm: Remove CONFIG_FDT conditionals X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=298c3833dba62512659ab550c3daa1e6d8faec94;p=qemu.git arm: Remove CONFIG_FDT conditionals 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 --- diff --git a/hw/arm/boot.c b/hw/arm/boot.c index f451529fce..defcf15097 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)