[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/58] mainstone: Don't enforce use of -pflash for qt
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 05/58] mainstone: Don't enforce use of -pflash for qtest |
Date: |
Tue, 8 Oct 2013 19:44:03 +0200 |
Simply skip flash setup for now.
Also drop useless debug output.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm/mainstone.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index b244f7e..9402c84 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -21,6 +21,7 @@
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
@@ -127,6 +128,9 @@ static void mainstone_common_init(MemoryRegion
*address_space_mem,
for (i = 0; i < 2; i ++) {
dinfo = drive_get(IF_PFLASH, 0, i);
if (!dinfo) {
+ if (qtest_enabled()) {
+ break;
+ }
fprintf(stderr, "Two flash images must be given with the "
"'pflash' parameter\n");
exit(1);
@@ -147,7 +151,6 @@ static void mainstone_common_init(MemoryRegion
*address_space_mem,
qdev_get_gpio_in(mpu->gpio, 0));
/* setup keypad */
- printf("map addr %p\n", &map);
pxa27x_register_keypad(mpu->kp, map, 0xe0);
/* MMC/SD host */
--
1.8.1.4
- [Qemu-devel] [PULL 28/58] a9mpcore: Convert to QOM realize, (continued)
- [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
- [Qemu-devel] [PULL 06/58] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 05/58] mainstone: Don't enforce use of -pflash for qtest,
Andreas Färber <=
- [Qemu-devel] [PULL 55/58] pcmcia: QOM'ify PCMCIACardState and MicroDriveState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 46/58] qdev-monitor: Fix crash when device_add is called with abstract driver, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 32/58] a15mpcore: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 23/58] a9mpcore: Embed GICState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 31/58] a15mpcore: Embed GICState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 17/58] shix: Don't require firmware presence for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 08/58] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 04/58] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 07/58] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 40/58] realview_gic: Convert to QOM realize, Andreas Färber, 2013/10/08