diff options
| -rw-r--r-- | hw/arm/boot.c | 4 | ||||
| -rw-r--r-- | vl.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1b913a43ca..942416d95a 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -773,6 +773,8 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) */ assert(!(info->secure_board_setup && kvm_enabled())); + info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); + /* Load the kernel. */ if (!info->kernel_filename || info->firmware_loaded) { @@ -833,8 +835,6 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) elf_machine = EM_ARM; } - info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); - if (!info->secondary_cpu_reset_hook) { info->secondary_cpu_reset_hook = default_reset_secondary; } diff --git a/vl.c b/vl.c index c657acdd3c..2569ec24f8 100644 --- a/vl.c +++ b/vl.c @@ -4389,11 +4389,6 @@ int main(int argc, char **argv, char **envp) exit(1); } - if (!linux_boot && qemu_opt_get(machine_opts, "dtb")) { - error_report("-dtb only allowed with -kernel option"); - exit(1); - } - if (semihosting_enabled() && !semihosting_get_argc() && kernel_filename) { /* fall back to the -kernel/-append */ semihosting_arg_fallback(kernel_filename, kernel_cmdline); |