From 564720219a0863625e9989fd258ccc57a616550f Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 24 May 2013 16:26:56 +0100 Subject: microblaze: 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 Reviewed-by: Edgar E. Iglesias Reviewed-by: Peter Crosthwaite Tested-by: Edgar E. Iglesias Message-id: 1369409217-7553-4-git-send-email-peter.maydell@linaro.org --- hw/microblaze/boot.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'hw/microblaze') diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index e543d886b8..3f1d70ef9b 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; } -- cgit v1.2.1