Re: [Qemu-devel] [PATCH 3/4] microblaze: Remove CONFIG_FDT conditionals

[Peter Crosthwaite]

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/microblaze/boot.c |   12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index e543d88..3f1d70e 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -61,7 +61,6 @@ static int microblaze_load_dtb(hwaddr addr,
>                                        const char *dtb_filename)
>  {
>      int fdt_size;
> -#ifdef CONFIG_FDT
>      void *fdt = NULL;
>      int r;
>
> @@ -81,17 +80,6 @@ static int microblaze_load_dtb(hwaddr addr,
>      }
>
>      cpu_physical_memory_write(addr, fdt, fdt_size);
> -#else
> -    /* We lack libfdt so we cannot manipulate the fdt. Just pass on the blob
> -       to the kernel.  */
> -    if (dtb_filename) {
> -        fdt_size = load_image_targphys(dtb_filename, addr, 0x10000);
> -    }
> -    if (kernel_cmdline) {
> -        fprintf(stderr,
> -                "Warning: missing libfdt, cannot pass cmdline to kernel!\n");
> -    }
> -#endif
>      return fdt_size;
>  }
>
> --
> 1.7.9.5
>
>