Commit 84f1581861b880f28a927bbcefa564f54ea8d255
Committed by
Anthony Liguori
Anthony Liguori
1 parent
3f0855b1
Refactor code to remove one #ifdef CONFIG_FDT
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
2 additions
and
4 deletions
hw/petalogix_s3adsp1800_mmu.c
| @@ -52,14 +52,12 @@ static int petalogix_load_device_tree(target_phys_addr_t addr, | @@ -52,14 +52,12 @@ static int petalogix_load_device_tree(target_phys_addr_t addr, | ||
| 52 | target_phys_addr_t initrd_size, | 52 | target_phys_addr_t initrd_size, |
| 53 | const char *kernel_cmdline) | 53 | const char *kernel_cmdline) |
| 54 | { | 54 | { |
| 55 | + char *path; | ||
| 56 | + int fdt_size; | ||
| 55 | #ifdef CONFIG_FDT | 57 | #ifdef CONFIG_FDT |
| 56 | void *fdt; | 58 | void *fdt; |
| 57 | int r; | 59 | int r; |
| 58 | -#endif | ||
| 59 | - char *path; | ||
| 60 | - int fdt_size; | ||
| 61 | 60 | ||
| 62 | -#ifdef CONFIG_FDT | ||
| 63 | /* Try the local "mb.dtb" override. */ | 61 | /* Try the local "mb.dtb" override. */ |
| 64 | fdt = load_device_tree("mb.dtb", &fdt_size); | 62 | fdt = load_device_tree("mb.dtb", &fdt_size); |
| 65 | if (!fdt) { | 63 | if (!fdt) { |