[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 3/4] microblaze: Remove CONFIG_FDT conditionals
From: |
Peter Maydell |
Subject: |
[Qemu-ppc] [PATCH 3/4] microblaze: Remove CONFIG_FDT conditionals |
Date: |
Fri, 24 May 2013 16:26:56 +0100 |
Now that we know we're compiling with libfdt we can remove the
CONFIG_FDT conditionals.
Signed-off-by: Peter Maydell <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
- [Qemu-ppc] [PATCH 0/4] Require libfdt for arm/microblaze/ppc softmmu targets, Peter Maydell, 2013/05/24
- [Qemu-ppc] [PATCH 3/4] microblaze: Remove CONFIG_FDT conditionals,
Peter Maydell <=
- [Qemu-ppc] [PATCH 1/4] configure: Require libfdt for arm, ppc, microblaze softmmu targets, Peter Maydell, 2013/05/24
- [Qemu-ppc] [PATCH 2/4] arm: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/05/24
- [Qemu-ppc] [PATCH 4/4] ppc: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/05/24
- Re: [Qemu-ppc] [PATCH 0/4] Require libfdt for arm/microblaze/ppc softmmu targets, Edgar E. Iglesias, 2013/05/25