diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-05-24 16:26:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-06-14 15:34:19 +0100 |
| commit | 564720219a0863625e9989fd258ccc57a616550f (patch) | |
| tree | a9c2242d1cd98daf80851c28b7e7375d96846d7e /hw/microblaze | |
| parent | 298c3833dba62512659ab550c3daa1e6d8faec94 (diff) | |
| download | qemu-564720219a0863625e9989fd258ccc57a616550f.tar.gz | |
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 <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-4-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/microblaze')
| -rw-r--r-- | hw/microblaze/boot.c | 12 |
1 files changed, 0 insertions, 12 deletions
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; } |