[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/58] hw/arm/boot: Make user not specifying a kernel
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 01/58] hw/arm/boot: Make user not specifying a kernel not an error |
Date: |
Tue, 8 Oct 2013 19:43:59 +0200 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm/boot.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 1e313af..583ec79 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -354,8 +354,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info
*info)
/* Load the kernel. */
if (!info->kernel_filename) {
- fprintf(stderr, "Kernel image must be specified\n");
- exit(1);
+ /* If no kernel specified, do nothing; we will start from address 0
+ * (typically a boot ROM image) in the same way as hardware.
+ */
+ return;
}
info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");
--
1.8.1.4
- [Qemu-devel] [PULL 20/58] milkymist-uart: Use Device::realize instead of SysBusDevice::init, (continued)
- [Qemu-devel] [PULL 20/58] milkymist-uart: Use Device::realize instead of SysBusDevice::init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 38/58] arm11mpcore: Split off SCU device, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 47/58] qdev-monitor: Unref device when device_add fails, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 21/58] a9mpcore: Split off instance_init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 03/58] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 13/58] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 14/58] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 22/58] arm_gic: Extract headers hw/intc/arm_gic{, _common}.h, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 53/58] qom: Add pointer to int property helpers, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 52/58] qom: Clean up struct Error references, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 01/58] hw/arm/boot: Make user not specifying a kernel not an error,
Andreas Färber <=
- [Qemu-devel] [PULL 29/58] a9mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 28/58] a9mpcore: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 54/58] pxa: Fix typo "dettach", Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 02/58] hw/arm: Tidy up conditional calls to arm_load_kernel(), Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 24/58] a9scu: QOM cleanups, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 30/58] a15mpcore: Split off instance_init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 41/58] realview_gic: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 16/58] shix: Drop debug output, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 39/58] arm11mpcore: Convert ARM11MPCorePriveState to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 15/58] milkymist: Suppress -kernel/-bios/-drive error for qtest, Andreas Färber, 2013/10/08