diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-22 10:19:17 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-10 15:45:15 +0200 |
| commit | 47771d67563dc48753d275249d0764144d56357d (patch) | |
| tree | 2bd2349ccc3747278d70d538ef33fa3050bb3605 | |
| parent | d641ec30be4963f43bffe033f5265a57cb8f4c90 (diff) | |
| download | qemu-47771d67563dc48753d275249d0764144d56357d.zip qemu-47771d67563dc48753d275249d0764144d56357d.tar.gz qemu-47771d67563dc48753d275249d0764144d56357d.tar.bz2 | |
hw/xtensa: require libfdt
All other boards require libfdt if it can be used (including for example
i386/x86_64), so change the "imply" to "select" and always allow -dtb
in qemu-system-xtensa.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/xtensa/Kconfig | 4 | ||||
| -rw-r--r-- | hw/xtensa/xtfpga.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig index 8ea283a..fc5c785 100644 --- a/hw/xtensa/Kconfig +++ b/hw/xtensa/Kconfig @@ -14,8 +14,8 @@ config XTENSA_VIRT config XTENSA_XTFPGA bool default y - depends on XTENSA - imply DEVICE_TREE + depends on XTENSA && FDT + select DEVICE_TREE select OPENCORES_ETH select PFLASH_CFI01 select SERIAL diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index f49e659..955e886 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -356,7 +356,6 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) cur_tagptr = put_tag(cur_tagptr, BP_TAG_COMMAND_LINE, strlen(kernel_cmdline) + 1, kernel_cmdline); } -#ifdef CONFIG_FDT if (dtb_filename) { int fdt_size; void *fdt = load_device_tree(dtb_filename, &fdt_size); @@ -373,14 +372,6 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4 * KiB); g_free(fdt); } -#else - if (dtb_filename) { - error_report("could not load DTB '%s': " - "FDT support is not configured in QEMU", - dtb_filename); - exit(EXIT_FAILURE); - } -#endif if (initrd_filename) { BpMemInfo initrd_location = { 0 }; int initrd_size = load_ramdisk(initrd_filename, cur_lowmem, |