OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

powerpc: fix compilation with CONFIG_FDT undefined 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2010-02-27 19:47:22 +01:00
parent 04088adbe0
commit dbf916d85b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ppc440_bamboo.c
View File

@ -33,22 +33,20 @@ static int bamboo_load_device_tree(target_phys_addr_t addr,
target_phys_addr_t initrd_size, target_phys_addr_t initrd_size,
const char *kernel_cmdline) const char *kernel_cmdline)
{ {
void *fdt = NULL; int ret = -1;
#ifdef CONFIG_FDT #ifdef CONFIG_FDT
uint32_t mem_reg_property[] = { 0, 0, ramsize }; uint32_t mem_reg_property[] = { 0, 0, ramsize };
char *filename; char *filename;
int fdt_size; int fdt_size;
int ret; void *fdt;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
if (!filename) { if (!filename) {
ret = -1;
goto out; goto out;
} }
fdt = load_device_tree(filename, &fdt_size); fdt = load_device_tree(filename, &fdt_size);
qemu_free(filename); qemu_free(filename);
if (fdt == NULL) { if (fdt == NULL) {
ret = -1;
goto out; goto out;
} }

6
hw/ppce500_mpc8544ds.c
View File

@ -78,22 +78,20 @@ static int mpc8544_load_device_tree(target_phys_addr_t addr,
target_phys_addr_t initrd_size, target_phys_addr_t initrd_size,
const char *kernel_cmdline) const char *kernel_cmdline)
{ {
void *fdt = NULL; int ret = -1;
#ifdef CONFIG_FDT #ifdef CONFIG_FDT
uint32_t mem_reg_property[] = {0, ramsize}; uint32_t mem_reg_property[] = {0, ramsize};
char *filename; char *filename;
int fdt_size; int fdt_size;
int ret; void *fdt;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
if (!filename) { if (!filename) {
ret = -1;
goto out; goto out;
} }
fdt = load_device_tree(filename, &fdt_size); fdt = load_device_tree(filename, &fdt_size);
qemu_free(filename); qemu_free(filename);
if (fdt == NULL) { if (fdt == NULL) {
ret = -1;
goto out; goto out;
} }