diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-05-24 16:26:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-06-14 15:34:19 +0100 |
| commit | 298c3833dba62512659ab550c3daa1e6d8faec94 (patch) | |
| tree | 279680bc2b8edcccee28c82d539f776b686e5a13 /hw/arm/boot.c | |
| parent | e169e1e1ae1e75c522f932554890fb0f2f3e9999 (diff) | |
| download | qemu-298c3833dba62512659ab550c3daa1e6d8faec94.tar.gz | |
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 <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Message-id: 1369409217-7553-3-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/boot.c')
| -rw-r--r-- | hw/arm/boot.c | 7 |
1 files changed, 0 insertions, 7 deletions
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) |