ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Peter Maydell 2013-05-24 16:26:55 +01:00
parent e169e1e1ae
commit 298c3833db
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/arm/boot.c
View File

@ -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) static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
{ {
#ifdef CONFIG_FDT
uint32_t *mem_reg_property; uint32_t *mem_reg_property;
uint32_t mem_reg_propsize; uint32_t mem_reg_propsize;
void *fdt = NULL; 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); cpu_physical_memory_write(addr, fdt, size);
return 0; 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) static void do_cpu_reset(void *opaque)