2011-07-06 15:52:49 +02:00
|
|
|
/*
|
|
|
|
* PXA270-based Zipit Z2 device
|
|
|
|
*
|
|
|
|
* Copyright (c) 2011 by Vasily Khoruzhick <anarsoul@gmail.com>
|
|
|
|
*
|
|
|
|
* Code is based on mainstone platform.
|
|
|
|
*
|
|
|
|
* This code is licensed under the GNU GPL v2.
|
2012-01-13 17:44:23 +01:00
|
|
|
*
|
|
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
2011-07-06 15:52:49 +02:00
|
|
|
*/
|
|
|
|
|
2015-12-07 17:23:45 +01:00
|
|
|
#include "qemu/osdep.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/hw.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/arm/pxa.h"
|
2013-04-09 16:26:55 +02:00
|
|
|
#include "hw/arm/arm.h"
|
|
|
|
#include "hw/devices.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/i2c/i2c.h"
|
2016-01-21 15:15:03 +01:00
|
|
|
#include "hw/ssi/ssi.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/block/flash.h"
|
2012-11-28 12:06:30 +01:00
|
|
|
#include "ui/console.h"
|
2017-09-19 14:30:53 +02:00
|
|
|
#include "hw/audio/wm8750.h"
|
2011-07-06 15:52:49 +02:00
|
|
|
#include "audio/audio.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "exec/address-spaces.h"
|
2013-07-29 17:15:55 +02:00
|
|
|
#include "sysemu/qtest.h"
|
2017-09-13 18:04:57 +02:00
|
|
|
#include "cpu.h"
|
2011-07-06 15:52:49 +02:00
|
|
|
|
|
|
|
#ifdef DEBUG_Z2
|
|
|
|
#define DPRINTF(fmt, ...) \
|
|
|
|
printf(fmt, ## __VA_ARGS__)
|
|
|
|
#else
|
|
|
|
#define DPRINTF(fmt, ...)
|
|
|
|
#endif
|
|
|
|
|
2013-12-22 15:22:57 +01:00
|
|
|
static const struct keymap map[0x100] = {
|
2011-07-06 15:52:49 +02:00
|
|
|
[0 ... 0xff] = { -1, -1 },
|
|
|
|
[0x3b] = {0, 0}, /* Option = F1 */
|
|
|
|
[0xc8] = {0, 1}, /* Up */
|
|
|
|
[0xd0] = {0, 2}, /* Down */
|
|
|
|
[0xcb] = {0, 3}, /* Left */
|
|
|
|
[0xcd] = {0, 4}, /* Right */
|
|
|
|
[0xcf] = {0, 5}, /* End */
|
|
|
|
[0x0d] = {0, 6}, /* KPPLUS */
|
|
|
|
[0xc7] = {1, 0}, /* Home */
|
|
|
|
[0x10] = {1, 1}, /* Q */
|
|
|
|
[0x17] = {1, 2}, /* I */
|
|
|
|
[0x22] = {1, 3}, /* G */
|
|
|
|
[0x2d] = {1, 4}, /* X */
|
|
|
|
[0x1c] = {1, 5}, /* Enter */
|
|
|
|
[0x0c] = {1, 6}, /* KPMINUS */
|
|
|
|
[0xc9] = {2, 0}, /* PageUp */
|
|
|
|
[0x11] = {2, 1}, /* W */
|
|
|
|
[0x18] = {2, 2}, /* O */
|
|
|
|
[0x23] = {2, 3}, /* H */
|
|
|
|
[0x2e] = {2, 4}, /* C */
|
|
|
|
[0x38] = {2, 5}, /* LeftAlt */
|
|
|
|
[0xd1] = {3, 0}, /* PageDown */
|
|
|
|
[0x12] = {3, 1}, /* E */
|
|
|
|
[0x19] = {3, 2}, /* P */
|
|
|
|
[0x24] = {3, 3}, /* J */
|
|
|
|
[0x2f] = {3, 4}, /* V */
|
|
|
|
[0x2a] = {3, 5}, /* LeftShift */
|
|
|
|
[0x01] = {4, 0}, /* Esc */
|
|
|
|
[0x13] = {4, 1}, /* R */
|
|
|
|
[0x1e] = {4, 2}, /* A */
|
|
|
|
[0x25] = {4, 3}, /* K */
|
|
|
|
[0x30] = {4, 4}, /* B */
|
|
|
|
[0x1d] = {4, 5}, /* LeftCtrl */
|
|
|
|
[0x0f] = {5, 0}, /* Tab */
|
|
|
|
[0x14] = {5, 1}, /* T */
|
|
|
|
[0x1f] = {5, 2}, /* S */
|
|
|
|
[0x26] = {5, 3}, /* L */
|
|
|
|
[0x31] = {5, 4}, /* N */
|
|
|
|
[0x39] = {5, 5}, /* Space */
|
|
|
|
[0x3c] = {6, 0}, /* Stop = F2 */
|
|
|
|
[0x15] = {6, 1}, /* Y */
|
|
|
|
[0x20] = {6, 2}, /* D */
|
|
|
|
[0x0e] = {6, 3}, /* Backspace */
|
|
|
|
[0x32] = {6, 4}, /* M */
|
|
|
|
[0x33] = {6, 5}, /* Comma */
|
|
|
|
[0x3d] = {7, 0}, /* Play = F3 */
|
|
|
|
[0x16] = {7, 1}, /* U */
|
|
|
|
[0x21] = {7, 2}, /* F */
|
|
|
|
[0x2c] = {7, 3}, /* Z */
|
|
|
|
[0x27] = {7, 4}, /* Semicolon */
|
|
|
|
[0x34] = {7, 5}, /* Dot */
|
|
|
|
};
|
|
|
|
|
|
|
|
#define Z2_RAM_SIZE 0x02000000
|
|
|
|
#define Z2_FLASH_BASE 0x00000000
|
|
|
|
#define Z2_FLASH_SIZE 0x00800000
|
|
|
|
|
|
|
|
static struct arm_boot_info z2_binfo = {
|
|
|
|
.loader_start = PXA2XX_SDRAM_BASE,
|
|
|
|
.ram_size = Z2_RAM_SIZE,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define Z2_GPIO_SD_DETECT 96
|
|
|
|
#define Z2_GPIO_AC_IN 0
|
|
|
|
#define Z2_GPIO_KEY_ON 1
|
|
|
|
#define Z2_GPIO_LCD_CS 88
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
SSISlave ssidev;
|
|
|
|
int32_t selected;
|
|
|
|
int32_t enabled;
|
|
|
|
uint8_t buf[3];
|
|
|
|
uint32_t cur_reg;
|
|
|
|
int pos;
|
|
|
|
} ZipitLCD;
|
|
|
|
|
|
|
|
static uint32_t zipit_lcd_transfer(SSISlave *dev, uint32_t value)
|
|
|
|
{
|
|
|
|
ZipitLCD *z = FROM_SSI_SLAVE(ZipitLCD, dev);
|
|
|
|
uint16_t val;
|
|
|
|
if (z->selected) {
|
|
|
|
z->buf[z->pos] = value & 0xff;
|
|
|
|
z->pos++;
|
|
|
|
}
|
|
|
|
if (z->pos == 3) {
|
|
|
|
switch (z->buf[0]) {
|
|
|
|
case 0x74:
|
|
|
|
DPRINTF("%s: reg: 0x%.2x\n", __func__, z->buf[2]);
|
|
|
|
z->cur_reg = z->buf[2];
|
|
|
|
break;
|
|
|
|
case 0x76:
|
|
|
|
val = z->buf[1] << 8 | z->buf[2];
|
|
|
|
DPRINTF("%s: value: 0x%.4x\n", __func__, val);
|
|
|
|
if (z->cur_reg == 0x22 && val == 0x0000) {
|
|
|
|
z->enabled = 1;
|
|
|
|
printf("%s: LCD enabled\n", __func__);
|
|
|
|
} else if (z->cur_reg == 0x10 && val == 0x0000) {
|
|
|
|
z->enabled = 0;
|
|
|
|
printf("%s: LCD disabled\n", __func__);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DPRINTF("%s: unknown command!\n", __func__);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
z->pos = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void z2_lcd_cs(void *opaque, int line, int level)
|
|
|
|
{
|
|
|
|
ZipitLCD *z2_lcd = opaque;
|
|
|
|
z2_lcd->selected = !level;
|
|
|
|
}
|
|
|
|
|
2016-07-04 14:06:37 +02:00
|
|
|
static void zipit_lcd_realize(SSISlave *dev, Error **errp)
|
2011-07-06 15:52:49 +02:00
|
|
|
{
|
|
|
|
ZipitLCD *z = FROM_SSI_SLAVE(ZipitLCD, dev);
|
|
|
|
z->selected = 0;
|
|
|
|
z->enabled = 0;
|
|
|
|
z->pos = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VMStateDescription vmstate_zipit_lcd_state = {
|
|
|
|
.name = "zipit-lcd",
|
2012-07-24 04:23:22 +02:00
|
|
|
.version_id = 2,
|
|
|
|
.minimum_version_id = 2,
|
2011-07-06 15:52:49 +02:00
|
|
|
.fields = (VMStateField[]) {
|
2012-07-24 04:23:22 +02:00
|
|
|
VMSTATE_SSI_SLAVE(ssidev, ZipitLCD),
|
2011-07-06 15:52:49 +02:00
|
|
|
VMSTATE_INT32(selected, ZipitLCD),
|
|
|
|
VMSTATE_INT32(enabled, ZipitLCD),
|
|
|
|
VMSTATE_BUFFER(buf, ZipitLCD),
|
|
|
|
VMSTATE_UINT32(cur_reg, ZipitLCD),
|
|
|
|
VMSTATE_INT32(pos, ZipitLCD),
|
|
|
|
VMSTATE_END_OF_LIST(),
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2011-12-16 20:36:39 +01:00
|
|
|
static void zipit_lcd_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-16 20:36:39 +01:00
|
|
|
SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
|
|
|
|
|
2016-07-04 14:06:37 +02:00
|
|
|
k->realize = zipit_lcd_realize;
|
2011-12-16 20:36:39 +01:00
|
|
|
k->transfer = zipit_lcd_transfer;
|
2011-12-08 04:34:16 +01:00
|
|
|
dc->vmsd = &vmstate_zipit_lcd_state;
|
2011-12-16 20:36:39 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo zipit_lcd_info = {
|
2011-12-08 04:34:16 +01:00
|
|
|
.name = "zipit-lcd",
|
|
|
|
.parent = TYPE_SSI_SLAVE,
|
|
|
|
.instance_size = sizeof(ZipitLCD),
|
|
|
|
.class_init = zipit_lcd_class_init,
|
2011-07-06 15:52:49 +02:00
|
|
|
};
|
|
|
|
|
2013-12-19 21:55:44 +01:00
|
|
|
#define TYPE_AER915 "aer915"
|
|
|
|
#define AER915(obj) OBJECT_CHECK(AER915State, (obj), TYPE_AER915)
|
|
|
|
|
|
|
|
typedef struct AER915State {
|
|
|
|
I2CSlave parent_obj;
|
|
|
|
|
2011-07-06 15:52:49 +02:00
|
|
|
int len;
|
|
|
|
uint8_t buf[3];
|
|
|
|
} AER915State;
|
|
|
|
|
2011-12-05 03:28:27 +01:00
|
|
|
static int aer915_send(I2CSlave *i2c, uint8_t data)
|
2011-07-06 15:52:49 +02:00
|
|
|
{
|
2013-12-19 21:55:44 +01:00
|
|
|
AER915State *s = AER915(i2c);
|
|
|
|
|
2011-07-06 15:52:49 +02:00
|
|
|
s->buf[s->len] = data;
|
|
|
|
if (s->len++ > 2) {
|
|
|
|
DPRINTF("%s: message too long (%i bytes)\n",
|
|
|
|
__func__, s->len);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->len == 2) {
|
|
|
|
DPRINTF("%s: reg %d value 0x%02x\n", __func__,
|
|
|
|
s->buf[0], s->buf[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-09 12:40:20 +01:00
|
|
|
static int aer915_event(I2CSlave *i2c, enum i2c_event event)
|
2011-07-06 15:52:49 +02:00
|
|
|
{
|
2013-12-19 21:55:44 +01:00
|
|
|
AER915State *s = AER915(i2c);
|
|
|
|
|
2011-07-06 15:52:49 +02:00
|
|
|
switch (event) {
|
|
|
|
case I2C_START_SEND:
|
|
|
|
s->len = 0;
|
|
|
|
break;
|
|
|
|
case I2C_START_RECV:
|
|
|
|
if (s->len != 1) {
|
|
|
|
DPRINTF("%s: short message!?\n", __func__);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case I2C_FINISH:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2017-01-09 12:40:20 +01:00
|
|
|
|
|
|
|
return 0;
|
2011-07-06 15:52:49 +02:00
|
|
|
}
|
|
|
|
|
2011-12-05 03:28:27 +01:00
|
|
|
static int aer915_recv(I2CSlave *slave)
|
2011-07-06 15:52:49 +02:00
|
|
|
{
|
2013-12-19 21:55:44 +01:00
|
|
|
AER915State *s = AER915(slave);
|
2011-07-06 15:52:49 +02:00
|
|
|
int retval = 0x00;
|
|
|
|
|
|
|
|
switch (s->buf[0]) {
|
|
|
|
/* Return hardcoded battery voltage,
|
|
|
|
* 0xf0 means ~4.1V
|
|
|
|
*/
|
|
|
|
case 0x02:
|
|
|
|
retval = 0xf0;
|
|
|
|
break;
|
|
|
|
/* Return 0x00 for other regs,
|
|
|
|
* we don't know what they are for,
|
|
|
|
* anyway they return 0x00 on real hardware.
|
|
|
|
*/
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VMStateDescription vmstate_aer915_state = {
|
|
|
|
.name = "aer915",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
|
|
|
.fields = (VMStateField[]) {
|
|
|
|
VMSTATE_INT32(len, AER915State),
|
|
|
|
VMSTATE_BUFFER(buf, AER915State),
|
|
|
|
VMSTATE_END_OF_LIST(),
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2011-12-05 03:39:20 +01:00
|
|
|
static void aer915_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-05 03:39:20 +01:00
|
|
|
I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
|
|
|
|
|
|
|
|
k->event = aer915_event;
|
|
|
|
k->recv = aer915_recv;
|
|
|
|
k->send = aer915_send;
|
2011-12-08 04:34:16 +01:00
|
|
|
dc->vmsd = &vmstate_aer915_state;
|
2011-12-05 03:39:20 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo aer915_info = {
|
2013-12-19 21:55:44 +01:00
|
|
|
.name = TYPE_AER915,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_I2C_SLAVE,
|
|
|
|
.instance_size = sizeof(AER915State),
|
|
|
|
.class_init = aer915_class_init,
|
2011-07-06 15:52:49 +02:00
|
|
|
};
|
|
|
|
|
2014-05-07 16:42:57 +02:00
|
|
|
static void z2_init(MachineState *machine)
|
2011-07-06 15:52:49 +02:00
|
|
|
{
|
2014-05-07 16:42:57 +02:00
|
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
|
|
const char *kernel_cmdline = machine->kernel_cmdline;
|
|
|
|
const char *initrd_filename = machine->initrd_filename;
|
2011-08-12 01:07:19 +02:00
|
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
2011-07-06 15:52:49 +02:00
|
|
|
uint32_t sector_len = 0x10000;
|
2012-05-14 01:25:55 +02:00
|
|
|
PXA2xxState *mpu;
|
2011-07-06 15:52:49 +02:00
|
|
|
DriveInfo *dinfo;
|
2011-08-25 21:39:18 +02:00
|
|
|
int be;
|
2011-07-06 15:52:49 +02:00
|
|
|
void *z2_lcd;
|
2013-08-03 00:18:51 +02:00
|
|
|
I2CBus *bus;
|
2011-07-06 15:52:49 +02:00
|
|
|
DeviceState *wm;
|
|
|
|
|
|
|
|
/* Setup CPU & memory */
|
2017-09-13 18:04:57 +02:00
|
|
|
mpu = pxa270_init(address_space_mem, z2_binfo.ram_size, machine->cpu_type);
|
2011-07-06 15:52:49 +02:00
|
|
|
|
|
|
|
#ifdef TARGET_WORDS_BIGENDIAN
|
2011-08-25 21:39:18 +02:00
|
|
|
be = 1;
|
2011-07-06 15:52:49 +02:00
|
|
|
#else
|
2011-08-25 21:39:18 +02:00
|
|
|
be = 0;
|
2011-07-06 15:52:49 +02:00
|
|
|
#endif
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
2013-07-29 17:15:55 +02:00
|
|
|
if (!dinfo && !qtest_enabled()) {
|
hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-arm@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-3-armbru@redhat.com>
2018-02-03 09:43:03 +01:00
|
|
|
error_report("Flash image must be given with the "
|
|
|
|
"'pflash' parameter");
|
2011-07-06 15:52:49 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2011-08-25 21:39:18 +02:00
|
|
|
if (!pflash_cfi01_register(Z2_FLASH_BASE,
|
2011-08-04 14:55:30 +02:00
|
|
|
NULL, "z2.flash0", Z2_FLASH_SIZE,
|
2014-10-07 13:59:18 +02:00
|
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
2014-10-07 13:59:13 +02:00
|
|
|
sector_len, Z2_FLASH_SIZE / sector_len,
|
|
|
|
4, 0, 0, 0, 0, be)) {
|
hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-arm@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-3-armbru@redhat.com>
2018-02-03 09:43:03 +01:00
|
|
|
error_report("Error registering flash memory");
|
2011-07-06 15:52:49 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* setup keypad */
|
2012-05-14 01:25:55 +02:00
|
|
|
pxa27x_register_keypad(mpu->kp, map, 0x100);
|
2011-07-06 15:52:49 +02:00
|
|
|
|
|
|
|
/* MMC/SD host */
|
2012-05-14 01:25:55 +02:00
|
|
|
pxa2xx_mmci_handlers(mpu->mmc,
|
2011-07-06 15:52:49 +02:00
|
|
|
NULL,
|
2012-05-14 01:25:55 +02:00
|
|
|
qdev_get_gpio_in(mpu->gpio, Z2_GPIO_SD_DETECT));
|
2011-07-06 15:52:49 +02:00
|
|
|
|
2011-12-08 04:34:16 +01:00
|
|
|
type_register_static(&zipit_lcd_info);
|
|
|
|
type_register_static(&aer915_info);
|
2012-05-14 01:25:55 +02:00
|
|
|
z2_lcd = ssi_create_slave(mpu->ssp[1], "zipit-lcd");
|
|
|
|
bus = pxa2xx_i2c_bus(mpu->i2c[0]);
|
2013-12-19 21:55:44 +01:00
|
|
|
i2c_create_slave(bus, TYPE_AER915, 0x55);
|
2017-09-19 14:30:53 +02:00
|
|
|
wm = i2c_create_slave(bus, TYPE_WM8750, 0x1b);
|
2012-05-14 01:25:55 +02:00
|
|
|
mpu->i2s->opaque = wm;
|
|
|
|
mpu->i2s->codec_out = wm8750_dac_dat;
|
|
|
|
mpu->i2s->codec_in = wm8750_adc_dat;
|
|
|
|
wm8750_data_req_set(wm, mpu->i2s->data_req, mpu->i2s);
|
2011-07-06 15:52:49 +02:00
|
|
|
|
2012-05-14 01:25:55 +02:00
|
|
|
qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS,
|
2014-06-18 09:55:18 +02:00
|
|
|
qemu_allocate_irq(z2_lcd_cs, z2_lcd, 0));
|
2011-07-06 15:52:49 +02:00
|
|
|
|
2013-10-25 16:44:38 +02:00
|
|
|
z2_binfo.kernel_filename = kernel_filename;
|
|
|
|
z2_binfo.kernel_cmdline = kernel_cmdline;
|
|
|
|
z2_binfo.initrd_filename = initrd_filename;
|
|
|
|
z2_binfo.board_id = 0x6dd;
|
|
|
|
arm_load_kernel(mpu->cpu, &z2_binfo);
|
2011-07-06 15:52:49 +02:00
|
|
|
}
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
static void z2_machine_init(MachineClass *mc)
|
2011-07-06 15:52:49 +02:00
|
|
|
{
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "Zipit Z2 (PXA27x)";
|
|
|
|
mc->init = z2_init;
|
2017-09-07 14:54:54 +02:00
|
|
|
mc->ignore_memory_transaction_failures = true;
|
2017-09-13 18:04:57 +02:00
|
|
|
mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c5");
|
2011-07-06 15:52:49 +02:00
|
|
|
}
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
DEFINE_MACHINE("z2", z2_machine_init)
|