diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2010-02-27 19:47:22 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-02-27 19:47:22 +0100 |
| commit | dbf916d85b9ae834b8f206c7a2d297832846e6e0 (patch) | |
| tree | a9348d3848b5fb5110ed3730be114128c7c63050 /hw | |
| parent | 04088adbe0c5adca66adb6022723362ad90ed0fc (diff) | |
powerpc: fix compilation with CONFIG_FDT undefined
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc440_bamboo.c | 6 | ||||
| -rw-r--r-- | hw/ppce500_mpc8544ds.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index dce37219c8..40e463ba63 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -33,22 +33,20 @@ static int bamboo_load_device_tree(target_phys_addr_t addr, target_phys_addr_t initrd_size, const char *kernel_cmdline) { - void *fdt = NULL; + int ret = -1; #ifdef CONFIG_FDT uint32_t mem_reg_property[] = { 0, 0, ramsize }; char *filename; int fdt_size; - int ret; + void *fdt; filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); if (!filename) { - ret = -1; goto out; } fdt = load_device_tree(filename, &fdt_size); qemu_free(filename); if (fdt == NULL) { - ret = -1; goto out; } diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index fd428fad9d..25008177b4 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -78,22 +78,20 @@ static int mpc8544_load_device_tree(target_phys_addr_t addr, target_phys_addr_t initrd_size, const char *kernel_cmdline) { - void *fdt = NULL; + int ret = -1; #ifdef CONFIG_FDT uint32_t mem_reg_property[] = {0, ramsize}; char *filename; int fdt_size; - int ret; + void *fdt; filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); if (!filename) { - ret = -1; goto out; } fdt = load_device_tree(filename, &fdt_size); qemu_free(filename); if (fdt == NULL) { - ret = -1; goto out; } |