[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/4] arm: Remove CONFIG_FDT conditionals
From: |
Peter Crosthwaite |
Subject: |
Re: [Qemu-devel] [PATCH 2/4] arm: Remove CONFIG_FDT conditionals |
Date: |
Tue, 28 May 2013 14:09:22 +1000 |
On Sat, May 25, 2013 at 1:26 AM, Peter Maydell <address@hidden> wrote:
> Now that we know we're compiling with libfdt, we can remove the
> CONFIG_FDT conditionals.
>
> Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
> ---
> 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
>
>
- [Qemu-devel] [PATCH 0/4] Require libfdt for arm/microblaze/ppc softmmu targets, Peter Maydell, 2013/05/24
- [Qemu-devel] [PATCH 3/4] microblaze: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/05/24
- [Qemu-devel] [PATCH 1/4] configure: Require libfdt for arm, ppc, microblaze softmmu targets, Peter Maydell, 2013/05/24
- [Qemu-devel] [PATCH 2/4] arm: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/05/24
- Re: [Qemu-devel] [PATCH 2/4] arm: Remove CONFIG_FDT conditionals,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH 4/4] ppc: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/05/24
- Re: [Qemu-devel] [PATCH 0/4] Require libfdt for arm/microblaze/ppc softmmu targets, Edgar E. Iglesias, 2013/05/25