| Message ID | 1369409217-7553-3-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 298c3833dba62512659ab550c3daa1e6d8faec94 |
| Headers | show |
On Sat, May 25, 2013 at 1:26 AM, Peter Maydell <peter.maydell@linaro.org> wrote: > 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: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > --- > 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 > >
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)
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> --- hw/arm/boot.c | 7 ------- 1 file changed, 7 deletions(-)