diff options
author | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2009-05-27 10:49:12 +0200 |
---|---|---|
committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2009-05-27 10:49:12 +0200 |
commit | 7696d1ecd0fe4805b630161d276a169c01f80e91 (patch) | |
tree | a3b971140264fc3339895abe756f30b1c136ca8a /hw | |
parent | 48c50a6234447c36d518457c6a1cbb95a1b557fe (diff) | |
download | hqemu-7696d1ecd0fe4805b630161d276a169c01f80e91.zip hqemu-7696d1ecd0fe4805b630161d276a169c01f80e91.tar.gz |
microblaze: Conditionalize FDT features.
If libfdt is not available, disable the fdt manipulation features.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/petalogix_s3adsp1800_mmu.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c index b317515..80097df 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/petalogix_s3adsp1800_mmu.c @@ -52,12 +52,15 @@ static int petalogix_load_device_tree(target_phys_addr_t addr, target_phys_addr_t initrd_size, const char *kernel_cmdline) { +#ifdef HAVE_FDT void *fdt; char *path = NULL; - int fdt_size; int pathlen; int r; +#endif + int fdt_size; +#ifdef HAVE_FDT /* Try the local "mb.dtb" override. */ fdt = load_device_tree("mb.dtb", &fdt_size); if (!fdt) { @@ -74,8 +77,20 @@ static int petalogix_load_device_tree(target_phys_addr_t addr, r = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline); if (r < 0) fprintf(stderr, "couldn't set /chosen/bootargs\n"); - printf("write fdt to addr=%x fdtsize=%d\n", addr, fdt_size); cpu_physical_memory_write (addr, (void *)fdt, fdt_size); +#else + /* We lack libfdt so we cannot manipulate the fdt. Just pass on the blob + to the kernel. */ + fdt_size = load_image_targphys("mb.dtb", addr, 0x10000); + if (fdt_size < 0) { + fdt_size = load_image_targphys(BINARY_DEVICE_TREE_FILE, addr, 0x10000); + } + + if (kernel_cmdline) { + fprintf(stderr, + "Warning: missing libfdt, cannot pass cmdline to kernel!\n"); + } +#endif return fdt_size; } |