[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/10] microblaze: Remove CONFIG_FDT conditionals
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 09/10] microblaze: Remove CONFIG_FDT conditionals |
Date: |
Fri, 14 Jun 2013 15:53:13 +0100 |
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: Edgar E. Iglesias <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Tested-by: Edgar E. Iglesias <address@hidden>
Message-id: 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-devel] [PULL 00/10] configury queue, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 05/10] build: drop TARGET_TYPE, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 10/10] ppc: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 07/10] configure: Require libfdt for arm, ppc, microblaze softmmu targets, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 09/10] microblaze: Remove CONFIG_FDT conditionals,
Peter Maydell <=
- [Qemu-devel] [PULL 08/10] arm: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 02/10] build: rename TARGET_ARCH2 to TARGET_NAME, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 01/10] Add a stp file for usage from build directory, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 03/10] build: do not use TARGET_ARCH, Peter Maydell, 2013/06/14
- Re: [Qemu-devel] [PULL 00/10] configury queue, Paolo Bonzini, 2013/06/14
- [Qemu-devel] [PULL 04/10] main: use TARGET_ARCH only for the target-specific #define, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Peter Maydell, 2013/06/14