[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.6? 03/14] mainstone: Don't enforce use of -pfl
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.6? 03/14] mainstone: Don't enforce use of -pflash for qtest |
Date: |
Mon, 29 Jul 2013 19:15:30 +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 8e5fc26..e9d4b98 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] [PATCH for-1.6? 00/14] qtest: Test all targets, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 01/14] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 07/14] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 10/14] axis_dev88: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 12/14] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 03/14] mainstone: Don't enforce use of -pflash for qtest,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 05/14] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 06/14] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 09/14] armv7m: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 13/14] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 04/14] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 14/14] qtest: Add dummy machine tests, Andreas Färber, 2013/07/29