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
This commit is contained in:
parent
298c3833db
commit
564720219a
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user