david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm/boot: Make user not specifying a kernel not an error

Browse Source 
Typically ARM boards will have some kind of flash which might contain
a boot ROM; it's therefore a valid use case to provide only an
image for the boot ROM and not require QEMU's internal boot loader
at all. Remove the fatal error if -kernel isn't specified.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1379980897-21277-2-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2013-10-25 15:44:38 +01:00 committed by Edgar E. Iglesias
parent ec426ff808
commit 9546dbabd5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/arm/boot.c
View File

@ -354,8 +354,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)
/* Load the kernel. */ /* Load the kernel. */
if (!info->kernel_filename) { if (!info->kernel_filename) {
fprintf(stderr, "Kernel image must be specified\n"); /* If no kernel specified, do nothing; we will start from address 0
exit(1); * (typically a boot ROM image) in the same way as hardware.
*/
return;
} }
info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");