mainstone: Don't enforce use of -pflash for qtest
Simply skip flash setup for now. Also drop useless debug output. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
f741a26c12
commit
d2f7c496c3
|
@ -21,6 +21,7 @@
|
||||||
#include "sysemu/blockdev.h"
|
#include "sysemu/blockdev.h"
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
|
#include "sysemu/qtest.h"
|
||||||
|
|
||||||
/* Device addresses */
|
/* Device addresses */
|
||||||
#define MST_FPGA_PHYS 0x08000000
|
#define MST_FPGA_PHYS 0x08000000
|
||||||
|
@ -127,6 +128,9 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
|
||||||
for (i = 0; i < 2; i ++) {
|
for (i = 0; i < 2; i ++) {
|
||||||
dinfo = drive_get(IF_PFLASH, 0, i);
|
dinfo = drive_get(IF_PFLASH, 0, i);
|
||||||
if (!dinfo) {
|
if (!dinfo) {
|
||||||
|
if (qtest_enabled()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
fprintf(stderr, "Two flash images must be given with the "
|
fprintf(stderr, "Two flash images must be given with the "
|
||||||
"'pflash' parameter\n");
|
"'pflash' parameter\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
@ -147,7 +151,6 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
|
||||||
qdev_get_gpio_in(mpu->gpio, 0));
|
qdev_get_gpio_in(mpu->gpio, 0));
|
||||||
|
|
||||||
/* setup keypad */
|
/* setup keypad */
|
||||||
printf("map addr %p\n", &map);
|
|
||||||
pxa27x_register_keypad(mpu->kp, map, 0xe0);
|
pxa27x_register_keypad(mpu->kp, map, 0xe0);
|
||||||
|
|
||||||
/* MMC/SD host */
|
/* MMC/SD host */
|
||||||
|
|
Loading…
Reference in New Issue