[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] arm: Remove CONFIG_FDT conditionals
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 08/10] arm: Remove CONFIG_FDT conditionals |
Date: |
Fri, 14 Jun 2013 15:53:12 +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/arm/boot.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index f451529..defcf15 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -227,7 +227,6 @@ static void set_kernel_args_old(const struct arm_boot_info
*info)
static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
{
-#ifdef CONFIG_FDT
uint32_t *mem_reg_property;
uint32_t mem_reg_propsize;
void *fdt = NULL;
@@ -308,12 +307,6 @@ static int load_dtb(hwaddr addr, const struct
arm_boot_info *binfo)
cpu_physical_memory_write(addr, fdt, size);
return 0;
-
-#else
- fprintf(stderr, "Device tree requested, "
- "but qemu was compiled without fdt support\n");
- return -1;
-#endif
}
static void do_cpu_reset(void *opaque)
--
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, 2013/06/14
- [Qemu-devel] [PULL 08/10] arm: Remove CONFIG_FDT conditionals,
Peter Maydell <=
- [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