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>
This commit is contained in:
parent
d641ec30be
commit
47771d6756
@ -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
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user