diff mbox

[v10,18/21] i.MX: Add SOC support for i.MX25

Message ID 9822e4026116bd34eb1e797384d49400c641a631.1436138842.git.jcd@tribudubois.net
State New
Headers show

Commit Message

Jean-Christophe Dubois July 6, 2015, 12:05 a.m. UTC
Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
---

Changes since v1:
    * not present on v1

Changes since v2:
    * not present on v2

Changes since v3:
    * not present on v3

Changes since v4:
    * not present on v4

Changes since v5:
    * not present on v5

Changes since v6:
    * not present on v6

Changes since v7:
    * Added a SOC specific file for i.MX25

Changes since v8:
    * use defines instead of hardcoded values for IRQ and ADDR
    * reworked the memory allocation for SOC memory

Changes since v9:
    * no change

 default-configs/arm-softmmu.mak |   1 +
 hw/arm/Makefile.objs            |   1 +
 hw/arm/fsl-imx25.c              | 272 ++++++++++++++++++++++++++++++++++++++++
 include/hw/arm/fsl-imx25.h      | 234 ++++++++++++++++++++++++++++++++++
 4 files changed, 508 insertions(+)
 create mode 100644 hw/arm/fsl-imx25.c
 create mode 100644 include/hw/arm/fsl-imx25.h

Comments

Peter Crosthwaite July 6, 2015, 7:42 a.m. UTC | #1
Many of the same comments I had before for IMX31 apply.

Liviu, CCd is actually working on a simlar problem for multiple SoCs
of the same family using a mostly the same definition. I think the
same applies to the i.MXxx families.

How I suggest this can one can be done to avoid the code dup is:

1: create a base abstract class for the SoC. TYPE_IMX "fxl,imxxx"
2: define class struct members for your serial epit and gpt tables.
Add addresses and IRQs for singletons like CCM if they need to be
parameterised as well.
3: _init and _realize for the abstract class can then pull the tabular
data out of the class to create.
4: define iMX25 and iMX31 which in their class_init populate all the
tables using the data from the headers.

See m25p80.c for an example of multiple dev definitions based on an
abstract class and a table.

On Sun, Jul 5, 2015 at 5:05 PM, Jean-Christophe Dubois
<jcd@tribudubois.net> wrote:
> Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
> ---
>
> Changes since v1:
>     * not present on v1
>
> Changes since v2:
>     * not present on v2
>
> Changes since v3:
>     * not present on v3
>
> Changes since v4:
>     * not present on v4
>
> Changes since v5:
>     * not present on v5
>
> Changes since v6:
>     * not present on v6
>
> Changes since v7:
>     * Added a SOC specific file for i.MX25
>
> Changes since v8:
>     * use defines instead of hardcoded values for IRQ and ADDR
>     * reworked the memory allocation for SOC memory
>
> Changes since v9:
>     * no change
>
>  default-configs/arm-softmmu.mak |   1 +
>  hw/arm/Makefile.objs            |   1 +
>  hw/arm/fsl-imx25.c              | 272 ++++++++++++++++++++++++++++++++++++++++
>  include/hw/arm/fsl-imx25.h      | 234 ++++++++++++++++++++++++++++++++++
>  4 files changed, 508 insertions(+)
>  create mode 100644 hw/arm/fsl-imx25.c
>  create mode 100644 include/hw/arm/fsl-imx25.h
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 5fa84c6..bf7572b 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -100,6 +100,7 @@ CONFIG_ALLWINNER_A10_PIC=y
>  CONFIG_ALLWINNER_A10=y
>
>  CONFIG_FSL_IMX31=y
> +CONFIG_FSL_IMX25=y
>
>  CONFIG_IMX_I2C=y
>
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 2fbe344..b83aaca 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -13,4 +13,5 @@ obj-y += omap1.o omap2.o strongarm.o
>  obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
>  obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
>  obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o
> +obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o
>  obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
> diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
> new file mode 100644
> index 0000000..8325a9c
> --- /dev/null
> +++ b/hw/arm/fsl-imx25.c
> @@ -0,0 +1,272 @@
> +/*
> + * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
> + *
> + * i.MX25 SOC emulation.
> + *
> + * Based on hw/arm/xlnx-zynqmp.c
> + *
> + * Copyright (C) 2015 Xilinx Inc
> + * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> + *
> + *  This program is free software; you can redistribute it and/or modify it
> + *  under the terms of the GNU General Public License as published by the
> + *  Free Software Foundation; either version 2 of the License, or
> + *  (at your option) any later version.
> + *
> + *  This program is distributed in the hope that it will be useful, but WITHOUT
> + *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + *  for more details.
> + *
> + *  You should have received a copy of the GNU General Public License along
> + *  with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "hw/arm/fsl-imx25.h"
> +#include "sysemu/sysemu.h"
> +#include "exec/address-spaces.h"
> +
> +static void fsl_imx25_init(Object *obj)
> +{
> +    FslImx25State *s = FSL_IMX25(obj);
> +    int i;
> +
> +    object_initialize(&s->cpu, sizeof(s->cpu), "arm926-" TYPE_ARM_CPU);
> +
> +    object_initialize(&s->avic, sizeof(s->avic), TYPE_IMX_AVIC);
> +    qdev_set_parent_bus(DEVICE(&s->avic), sysbus_get_default());
> +
> +    object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX_CCM);
> +    qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default());
> +
> +    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
> +        if (i >= MAX_SERIAL_PORTS) {
> +            break;
> +        }
> +        object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_IMX_SERIAL);
> +        qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());
> +    }
> +
> +    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
> +        object_initialize(&s->gpt[i], sizeof(s->gpt[i]), TYPE_IMX_GPT);
> +        qdev_set_parent_bus(DEVICE(&s->gpt[i]), sysbus_get_default());
> +    }
> +
> +    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
> +        object_initialize(&s->epit[i], sizeof(s->epit[i]), TYPE_IMX_EPIT);
> +        qdev_set_parent_bus(DEVICE(&s->epit[i]), sysbus_get_default());
> +    }
> +
> +    object_initialize(&s->fec, sizeof(s->fec), TYPE_IMX_FEC);
> +    qdev_set_parent_bus(DEVICE(&s->fec), sysbus_get_default());
> +
> +    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
> +        object_initialize(&s->i2c[i], sizeof(s->i2c[i]), TYPE_IMX_I2C);
> +        qdev_set_parent_bus(DEVICE(&s->i2c[i]), sysbus_get_default());
> +    }
> +}
> +
> +static void fsl_imx25_realize(DeviceState *dev, Error **errp)
> +{
> +    FslImx25State *s = FSL_IMX25(dev);
> +    uint8_t i;
> +    Error *err = NULL;
> +
> +    /* Initialize the CPU */
> +    object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
> +    if (err) {
> +        error_propagate((errp), (err));
> +        return;
> +    }
> +
> +    /* Initialize the PIC */
> +    object_property_set_bool(OBJECT(&s->avic), true, "realized", &err);
> +    if (err) {
> +        error_propagate((errp), (err));
> +        return;
> +    }
> +    /* Connect the PIC interrupt to the CPU */
> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->avic), 0, FSL_IMX25_AVIC_ADDR);
> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 0,
> +                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 1,
> +                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
> +
> +    /* Initialize the CCM */
> +    object_property_set_bool(OBJECT(&s->ccm), true, "realized", &err);
> +    if (err) {
> +        error_propagate((errp), (err));
> +        return;
> +    }
> +    /* Map CCM memory */
> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccm), 0, FSL_IMX25_CCM_ADDR);
> +
> +    /* Initialize all UARTS */
> +    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
> +        static const struct {
> +            hwaddr addr;
> +            unsigned int irq;
> +        } serial_table[FSL_IMX25_NUM_UARTS] = {
> +            { FSL_IMX25_UART1_ADDR, FSL_IMX25_UART1_IRQ },
> +            { FSL_IMX25_UART2_ADDR, FSL_IMX25_UART2_IRQ },
> +            { FSL_IMX25_UART3_ADDR, FSL_IMX25_UART3_IRQ },
> +            { FSL_IMX25_UART4_ADDR, FSL_IMX25_UART4_IRQ  },

Whitespace inconsistency.

> +            { FSL_IMX25_UART5_ADDR, FSL_IMX25_UART5_IRQ }
> +        };
> +
> +        /* Bail out if we exeeded Qemu UART count */
> +        if (i >= MAX_SERIAL_PORTS) {
> +            break;
> +        }
> +        /* Initialize the UART */
> +        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);
> +        if (err) {
> +            error_propagate((errp), (err));
> +            return;
> +        }
> +        /* Map UART memory */
> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, serial_table[i].addr);
> +        /* Connet UART IRQ to PIC */
> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,
> +                           qdev_get_gpio_in(DEVICE(&s->avic),
> +                                            serial_table[i].irq));
> +    }
> +
> +    /* Initialize all GPT timers */
> +    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
> +        static const struct {
> +            hwaddr addr;
> +            unsigned int irq;
> +        } gpt_table[FSL_IMX25_NUM_GPTS] = {
> +            { FSL_IMX25_GPT1_ADDR, FSL_IMX25_GPT1_IRQ },
> +            { FSL_IMX25_GPT2_ADDR, FSL_IMX25_GPT2_IRQ },
> +            { FSL_IMX25_GPT3_ADDR, FSL_IMX25_GPT3_IRQ },
> +            { FSL_IMX25_GPT4_ADDR, FSL_IMX25_GPT4_IRQ }
> +        };
> +
> +        s->gpt[i].ccm = DEVICE(&s->ccm);
> +
> +        /* Initialize the GPT */
> +        object_property_set_bool(OBJECT(&s->gpt[i]), true, "realized", &err);
> +        if (err) {
> +            error_propagate((errp), (err));
> +            return;
> +        }
> +        /* Map GPT memory */
> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt[i]), 0, gpt_table[i].addr);
> +        /* Connet GPT IRQ to PIC */
> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt[i]), 0,
> +                           qdev_get_gpio_in(DEVICE(&s->avic),
> +                                            gpt_table[i].irq));
> +    }
> +
> +    /* Initialize all EPIT timers */
> +    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
> +        static const struct {
> +            hwaddr addr;
> +            unsigned int irq;
> +        } epit_table[FSL_IMX25_NUM_EPITS] = {
> +            { FSL_IMX25_EPIT1_ADDR, FSL_IMX25_EPIT1_IRQ },
> +            { FSL_IMX25_EPIT2_ADDR, FSL_IMX25_EPIT2_IRQ }
> +        };
> +
> +        s->epit[i].ccm = DEVICE(&s->ccm);
> +
> +        /* Initialize the EPIT */
> +        object_property_set_bool(OBJECT(&s->epit[i]), true, "realized", &err);
> +        if (err) {
> +            error_propagate((errp), (err));
> +            return;
> +        }
> +        /* Map EPIT memory */
> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0, epit_table[i].addr);
> +        /* Connet EPIT IRQ to PIC */
> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->epit[i]), 0,
> +                           qdev_get_gpio_in(DEVICE(&s->avic),
> +                                            epit_table[i].irq));
> +    }
> +
> +    /* Initialize the FEC */
> +    qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);
> +    object_property_set_bool(OBJECT(&s->fec), true, "realized", &err);
> +    if (err) {
> +        error_propagate((errp), (err));
> +        return;
> +    }
> +    /* Map FEC memory */
> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->fec), 0, FSL_IMX25_FEC_ADDR);
> +    /* Connet FEC IRQ to PIC */
> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->fec), 0,
> +                       qdev_get_gpio_in(DEVICE(&s->avic), FSL_IMX25_FEC_IRQ));
> +
> +
> +    /* Initialize all I2C */
> +    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
> +        static const struct {
> +            hwaddr addr;
> +            unsigned int irq;
> +        } i2c_table[FSL_IMX25_NUM_I2CS] = {
> +            { FSL_IMX25_I2C1_ADDR, FSL_IMX25_I2C1_IRQ  },
> +            { FSL_IMX25_I2C2_ADDR, FSL_IMX25_I2C2_IRQ  },
> +            { FSL_IMX25_I2C3_ADDR, FSL_IMX25_I2C3_IRQ }
> +        };
> +
> +        /* Initialize the I2C */
> +        object_property_set_bool(OBJECT(&s->i2c[i]), true, "realized", &err);
> +        if (err) {
> +            error_propagate((errp), (err));
> +            return;
> +        }
> +        /* Map I2C memory */
> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c[i]), 0, i2c_table[i].addr);
> +        /* Connet I2C IRQ to PIC */
> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c[i]), 0,
> +                           qdev_get_gpio_in(DEVICE(&s->avic),
> +                                            i2c_table[i].irq));
> +    }
> +
> +    /* initialize 2 x 16 KB ROM */
> +    memory_region_init_rom_device(&s->rom[0], NULL, NULL, NULL,
> +                                  "imx25.rom0", FSL_IMX25_ROM0_SIZE, &err);
> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR,
> +                                &s->rom[0]);
> +    memory_region_init_rom_device(&s->rom[1], NULL, NULL, NULL,
> +                                  "imx25.rom1", FSL_IMX25_ROM1_SIZE, &err);
> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM1_ADDR,
> +                                &s->rom[1]);
> +
> +    /* initialize internal RAM (128 KB) */
> +    memory_region_init_ram(&s->iram, NULL, "imx25.iram", FSL_IMX25_IRAM_SIZE,
> +                           &error_abort);
> +    vmstate_register_ram_global(&s->iram);
> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ADDR,
> +                                &s->iram);
> +
> +    /* internal RAM (16 KB) is aliased over 128 MB - 128 KB */
> +    memory_region_init_alias(&s->iram_alias, NULL, "imx25.iram_alias",
> +                             &s->iram, 0, FSL_IMX25_IRAM_ALIAS_SIZE);
> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ALIAS_ADDR,
> +                                &s->iram_alias);
> +}
> +
> +static void fsl_imx25_class_init(ObjectClass *oc, void *data)
> +{
> +    DeviceClass *dc = DEVICE_CLASS(oc);
> +
> +    dc->realize = fsl_imx25_realize;
> +}
> +
> +static const TypeInfo fsl_imx25_type_info = {
> +    .name = TYPE_FSL_IMX25,
> +    .parent = TYPE_DEVICE,
> +    .instance_size = sizeof(FslImx25State),
> +    .instance_init = fsl_imx25_init,
> +    .class_init = fsl_imx25_class_init,
> +};
> +
> +static void fsl_imx25_register_types(void)
> +{
> +    type_register_static(&fsl_imx25_type_info);
> +}
> +
> +type_init(fsl_imx25_register_types)
> diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
> new file mode 100644
> index 0000000..62691f9
> --- /dev/null
> +++ b/include/hw/arm/fsl-imx25.h
> @@ -0,0 +1,234 @@
> +/*
> + * Freescale i.MX25 SoC emulation
> + *
> + * Copyright (C) 2015 Jean-Christophe Dubois <jcd@tribudubois.net>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + * for more details.
> + */
> +
> +#ifndef FSL_IMX25_H
> +#define FSL_IMX25_H
> +
> +#include "hw/arm/arm.h"
> +#include "hw/intc/imx_avic.h"
> +#include "hw/misc/imx_ccm.h"
> +#include "hw/char/imx_serial.h"
> +#include "hw/timer/imx_gpt.h"
> +#include "hw/timer/imx_epit.h"
> +#include "hw/net/imx_fec.h"
> +#include "hw/i2c/imx_i2c.h"
> +#include "exec/memory.h"
> +
> +#define TYPE_FSL_IMX25 "fsl,imx25"
> +#define FSL_IMX25(obj) OBJECT_CHECK(FslImx25State, (obj), TYPE_FSL_IMX25)
> +
> +#define FSL_IMX25_NUM_UARTS 5
> +#define FSL_IMX25_NUM_GPTS 4
> +#define FSL_IMX25_NUM_EPITS 2
> +#define FSL_IMX25_NUM_I2CS 3
> +
> +typedef struct {
> +    /*< private >*/
> +    DeviceState parent_obj;
> +
> +    /*< public >*/
> +    ARMCPU         cpu;
> +    IMXAVICState   avic;
> +    IMXCCMState    ccm;
> +    IMXSerialState uart[FSL_IMX25_NUM_UARTS];
> +    IMXGPTState    gpt[FSL_IMX25_NUM_GPTS];
> +    IMXEPITState   epit[FSL_IMX25_NUM_EPITS];
> +    IMXFECState    fec;
> +    IMXI2CState    i2c[FSL_IMX25_NUM_I2CS];
> +    MemoryRegion   rom[2];
> +    MemoryRegion   iram;
> +    MemoryRegion   iram_alias;
> +} FslImx25State;
> +
> +/**
> + * i.MX25 memory map
> + ****************************************************************
> + * 0x0000_0000 0x0000_3FFF 16 Kbytes   ROM (36 Kbytes)
> + * 0x0000_4000 0x0040_3FFF 4 Mbytes    Reserved
> + * 0x0040_4000 0x0040_8FFF 20 Kbytes   ROM (36 Kbytes)
> + * 0x0040_9000 0x0FFF_FFFF 252 Mbytes (minus 36 Kbytes) Reserved
> + * 0x1000_0000 0x1FFF_FFFF 256 Mbytes  Reserved
> + * 0x2000_0000 0x2FFF_FFFF 256 Mbytes  Reserved
> + * 0x3000_0000 0x3FFF_FFFF 256 Mbytes  Reserved
> + * 0x4000_0000 0x43EF_FFFF 63 Mbytes   Reserved
> + * 0x43F0_0000 0x43F0_3FFF 16 Kbytes   AIPS A control registers
> + * 0x43F0_4000 0x43F0_7FFF 16 Kbytes   ARM926 platform MAX
> + * 0x43F0_8000 0x43F0_BFFF 16 Kbytes   ARM926 platform CLKCTL
> + * 0x43F0_C000 0x43F0_FFFF 16 Kbytes   ARM926 platform ETB registers
> + * 0x43F1_0000 0x43F1_3FFF 16 Kbytes   ARM926 platform ETB memory
> + * 0x43F1_4000 0x43F1_7FFF 16 Kbytes   ARM926 platform AAPE registers
> + * 0x43F1_8000 0x43F7_FFFF 416 Kbytes  Reserved
> + * 0x43F8_0000 0x43F8_3FFF 16 Kbytes   I2C-1
> + * 0x43F8_4000 0x43F8_7FFF 16 Kbytes   I2C-3
> + * 0x43F8_8000 0x43F8_BFFF 16 Kbytes   CAN-1
> + * 0x43F8_C000 0x43F8_FFFF 16 Kbytes   CAN-2
> + * 0x43F9_0000 0x43F9_3FFF 16 Kbytes   UART-1
> + * 0x43F9_4000 0x43F9_7FFF 16 Kbytes   UART-2
> + * 0x43F9_8000 0x43F9_BFFF 16 Kbytes   I2C-2
> + * 0x43F9_C000 0x43F9_FFFF 16 Kbytes   1-Wire
> + * 0x43FA_0000 0x43FA_3FFF 16 Kbytes   ATA (CPU side)
> + * 0x43FA_4000 0x43FA_7FFF 16 Kbytes   CSPI-1
> + * 0x43FA_8000 0x43FA_BFFF 16 Kbytes   KPP
> + * 0x43FA_C000 0x43FA_FFFF 16 Kbytes   IOMUXC
> + * 0x43FB_0000 0x43FB_3FFF 16 Kbytes   AUDMUX
> + * 0x43FB_4000 0x43FB_7FFF 16 Kbytes   Reserved
> + * 0x43FB_8000 0x43FB_BFFF 16 Kbytes   ECT (IP BUS A)
> + * 0x43FB_C000 0x43FB_FFFF 16 Kbytes   ECT (IP BUS B)
> + * 0x43FC_0000 0x43FF_FFFF 256 Kbytes  Reserved AIPS A off-platform slots
> + * 0x4400_0000 0x4FFF_FFFF 192 Mbytes  Reserved
> + * 0x5000_0000 0x5000_3FFF 16 Kbytes   SPBA base address
> + * 0x5000_4000 0x5000_7FFF 16 Kbytes   CSPI-3
> + * 0x5000_8000 0x5000_BFFF 16 Kbytes   UART-4
> + * 0x5000_C000 0x5000_FFFF 16 Kbytes   UART-3
> + * 0x5001_0000 0x5001_3FFF 16 Kbytes   CSPI-2
> + * 0x5001_4000 0x5001_7FFF 16 Kbytes   SSI-2
> + * 0x5001_C000 0x5001_FFFF 16 Kbytes   Reserved
> + * 0x5002_0000 0x5002_3FFF 16 Kbytes   ATA
> + * 0x5002_4000 0x5002_7FFF 16 Kbytes   SIM-1
> + * 0x5002_8000 0x5002_BFFF 16 Kbytes   SIM-2
> + * 0x5002_C000 0x5002_FFFF 16 Kbytes   UART-5
> + * 0x5003_0000 0x5003_3FFF 16 Kbytes   TSC
> + * 0x5003_4000 0x5003_7FFF 16 Kbytes   SSI-1
> + * 0x5003_8000 0x5003_BFFF 16 Kbytes   FEC
> + * 0x5003_C000 0x5003_FFFF 16 Kbytes   SPBA registers
> + * 0x5004_0000 0x51FF_FFFF 32 Mbytes (minus 256 Kbytes)
> + * 0x5200_0000 0x53EF_FFFF 31 Mbytes   Reserved
> + * 0x53F0_0000 0x53F0_3FFF 16 Kbytes   AIPS B control registers
> + * 0x53F0_4000 0x53F7_FFFF 496 Kbytes  Reserved
> + * 0x53F8_0000 0x53F8_3FFF 16 Kbytes   CCM
> + * 0x53F8_4000 0x53F8_7FFF 16 Kbytes   GPT-4
> + * 0x53F8_8000 0x53F8_BFFF 16 Kbytes   GPT-3
> + * 0x53F8_C000 0x53F8_FFFF 16 Kbytes   GPT-2
> + * 0x53F9_0000 0x53F9_3FFF 16 Kbytes   GPT-1
> + * 0x53F9_4000 0x53F9_7FFF 16 Kbytes   EPIT-1
> + * 0x53F9_8000 0x53F9_BFFF 16 Kbytes   EPIT-2
> + * 0x53F9_C000 0x53F9_FFFF 16 Kbytes   GPIO-4
> + * 0x53FA_0000 0x53FA_3FFF 16 Kbytes   PWM-2
> + * 0x53FA_4000 0x53FA_7FFF 16 Kbytes   GPIO-3
> + * 0x53FA_8000 0x53FA_BFFF 16 Kbytes   PWM-3
> + * 0x53FA_C000 0x53FA_FFFF 16 Kbytes   SCC
> + * 0x53FB_0000 0x53FB_3FFF 16 Kbytes   RNGB
> + * 0x53FB_4000 0x53FB_7FFF 16 Kbytes   eSDHC-1
> + * 0x53FB_8000 0x53FB_BFFF 16 Kbytes   eSDHC-2
> + * 0x53FB_C000 0x53FB_FFFF 16 Kbytes   LCDC
> + * 0x53FC_0000 0x53FC_3FFF 16 Kbytes   SLCDC
> + * 0x53FC_4000 0x53FC_7FFF 16 Kbytes   Reserved
> + * 0x53FC_8000 0x53FC_BFFF 16 Kbytes   PWM-4
> + * 0x53FC_C000 0x53FC_FFFF 16 Kbytes   GPIO-1
> + * 0x53FD_0000 0x53FD_3FFF 16 Kbytes   GPIO-2
> + * 0x53FD_4000 0x53FD_7FFF 16 Kbytes   SDMA
> + * 0x53FD_8000 0x53FD_BFFF 16 Kbytes   Reserved
> + * 0x53FD_C000 0x53FD_FFFF 16 Kbytes   WDOG
> + * 0x53FE_0000 0x53FE_3FFF 16 Kbytes   PWM-1
> + * 0x53FE_4000 0x53FE_7FFF 16 Kbytes   Reserved
> + * 0x53FE_8000 0x53FE_BFFF 16 Kbytes   Reserved
> + * 0x53FE_C000 0x53FE_FFFF 16 Kbytes   RTICv3
> + * 0x53FF_0000 0x53FF_3FFF 16 Kbytes   IIM
> + * 0x53FF_4000 0x53FF_7FFF 16 Kbytes   USB
> + * 0x53FF_8000 0x53FF_BFFF 16 Kbytes   CSI
> + * 0x53FF_C000 0x53FF_FFFF 16 Kbytes   DryIce
> + * 0x5400_0000 0x5FFF_FFFF 192 Mbytes  Reserved (aliased AIPS B slots)
> + * 0x6000_0000 0x67FF_FFFF 128 Mbytes  ARM926 platform ROMPATCH
> + * 0x6800_0000 0x6FFF_FFFF 128 Mbytes  ARM926 platform ASIC
> + * 0x7000_0000 0x77FF_FFFF 128 Mbytes  Reserved
> + * 0x7800_0000 0x7801_FFFF 128 Kbytes  RAM
> + * 0x7802_0000 0x7FFF_FFFF 128 Mbytes (minus 128 Kbytes)
> + * 0x8000_0000 0x8FFF_FFFF 256 Mbytes  SDRAM bank 0
> + * 0x9000_0000 0x9FFF_FFFF 256 Mbytes  SDRAM bank 1
> + * 0xA000_0000 0xA7FF_FFFF 128 Mbytes  WEIM CS0 (flash 128) 1
> + * 0xA800_0000 0xAFFF_FFFF 128 Mbytes  WEIM CS1 (flash 64) 1
> + * 0xB000_0000 0xB1FF_FFFF 32 Mbytes   WEIM CS2 (SRAM)
> + * 0xB200_0000 0xB3FF_FFFF 32 Mbytes   WEIM CS3 (SRAM)
> + * 0xB400_0000 0xB5FF_FFFF 32 Mbytes   WEIM CS4
> + * 0xB600_0000 0xB7FF_FFFF 32 Mbytes   Reserved
> + * 0xB800_0000 0xB800_0FFF 4 Kbytes    Reserved
> + * 0xB800_1000 0xB800_1FFF 4 Kbytes    SDRAM control registers
> + * 0xB800_2000 0xB800_2FFF 4 Kbytes    WEIM control registers
> + * 0xB800_3000 0xB800_3FFF 4 Kbytes    M3IF control registers
> + * 0xB800_4000 0xB800_4FFF 4 Kbytes    EMI control registers
> + * 0xB800_5000 0xBAFF_FFFF 32 Mbytes (minus 20 Kbytes)
> + * 0xBB00_0000 0xBB00_0FFF 4 Kbytes    NAND flash main area buffer
> + * 0xBB00_1000 0xBB00_11FF 512 B       NAND flash spare area buffer
> + * 0xBB00_1200 0xBB00_1DFF 3 Kbytes    Reserved
> + * 0xBB00_1E00 0xBB00_1FFF 512 B       NAND flash control regisers
> + * 0xBB01_2000 0xBFFF_FFFF 96 Mbytes (minus 8 Kbytes) Reserved
> + * 0xC000_0000 0xFFFF_FFFF 1024 Mbytes Reserved
> + */
> +
> +#define FSL_IMX25_ROM0_ADDR    0x00000000
> +#define FSL_IMX25_ROM0_SIZE    0x4000
> +#define FSL_IMX25_ROM1_ADDR    0x00404000
> +#define FSL_IMX25_ROM1_SIZE    0x4000
> +#define FSL_IMX25_I2C1_ADDR    0x43F80000
> +#define FSL_IMX25_I2C1_SIZE    0x4000
> +#define FSL_IMX25_I2C3_ADDR    0x43F84000
> +#define FSL_IMX25_I2C3_SIZE    0x4000
> +#define FSL_IMX25_UART1_ADDR   0x43F90000
> +#define FSL_IMX25_UART1_SIZE   0x4000
> +#define FSL_IMX25_UART2_ADDR   0x43F94000
> +#define FSL_IMX25_UART2_SIZE   0x4000
> +#define FSL_IMX25_I2C2_ADDR    0x43F98000
> +#define FSL_IMX25_I2C2_SIZE    0x4000
> +#define FSL_IMX25_UART4_ADDR   0x50008000
> +#define FSL_IMX25_UART4_SIZE   0x4000
> +#define FSL_IMX25_UART3_ADDR   0x5000C000
> +#define FSL_IMX25_UART3_SIZE   0x4000
> +#define FSL_IMX25_UART5_ADDR   0x5002C000
> +#define FSL_IMX25_UART5_SIZE   0x4000
> +#define FSL_IMX25_FEC_ADDR     0x50038000
> +#define FSL_IMX25_FEC_SIZE     0x4000
> +#define FSL_IMX25_CCM_ADDR     0x53F80000
> +#define FSL_IMX25_CCM_SIZE     0x4000
> +#define FSL_IMX25_GPT4_ADDR    0x53F84000
> +#define FSL_IMX25_GPT4_SIZE    0x4000
> +#define FSL_IMX25_GPT3_ADDR    0x53F88000
> +#define FSL_IMX25_GPT3_SIZE    0x4000
> +#define FSL_IMX25_GPT2_ADDR    0x53F8C000
> +#define FSL_IMX25_GPT2_SIZE    0x4000
> +#define FSL_IMX25_GPT1_ADDR    0x53F90000
> +#define FSL_IMX25_GPT1_SIZE    0x4000
> +#define FSL_IMX25_EPIT1_ADDR   0x53F94000
> +#define FSL_IMX25_EPIT1_SIZE   0x4000
> +#define FSL_IMX25_EPIT2_ADDR   0x53F98000
> +#define FSL_IMX25_EPIT2_SIZE   0x4000
> +#define FSL_IMX25_AVIC_ADDR    0x68000000
> +#define FSL_IMX25_AVIC_SIZE    0x4000
> +#define FSL_IMX25_IRAM_ADDR    0x78000000
> +#define FSL_IMX25_IRAM_SIZE    0x20000
> +#define FSL_IMX25_IRAM_ALIAS_ADDR      0x78020000
> +#define FSL_IMX25_IRAM_ALIAS_SIZE      0x7FE0000
> +#define FSL_IMX25_SDRAM0_ADDR  0x80000000
> +#define FSL_IMX25_SDRAM0_SIZE  0x10000000
> +#define FSL_IMX25_SDRAM1_ADDR  0x90000000
> +#define FSL_IMX25_SDRAM1_SIZE  0x10000000
> +
> +#define FSL_IMX25_UART1_IRQ    45
> +#define FSL_IMX25_UART2_IRQ    32
> +#define FSL_IMX25_UART3_IRQ    18
> +#define FSL_IMX25_UART4_IRQ    5
> +#define FSL_IMX25_UART5_IRQ    40
> +#define FSL_IMX25_GPT1_IRQ     54
> +#define FSL_IMX25_GPT2_IRQ     53
> +#define FSL_IMX25_GPT3_IRQ     29
> +#define FSL_IMX25_GPT4_IRQ     1
> +#define FSL_IMX25_EPIT1_IRQ    28
> +#define FSL_IMX25_EPIT2_IRQ    27
> +#define FSL_IMX25_FEC_IRQ      57
> +#define FSL_IMX25_I2C1_IRQ     3
> +#define FSL_IMX25_I2C2_IRQ     4
> +#define FSL_IMX25_I2C3_IRQ     10
> +
> +#endif // FSL_IMX25_H

C++ comment.

Regards,
Peter

> --
> 2.1.4
>
>
Jean-Christophe Dubois July 8, 2015, 5:58 p.m. UTC | #2
Le 06/07/2015 09:42, Peter Crosthwaite a écrit :
> Many of the same comments I had before for IMX31 apply.
>
> Liviu, CCd is actually working on a simlar problem for multiple SoCs
> of the same family using a mostly the same definition. I think the
> same applies to the i.MXxx families.
>
> How I suggest this can one can be done to avoid the code dup is:
>
> 1: create a base abstract class for the SoC. TYPE_IMX "fxl,imxxx"
> 2: define class struct members for your serial epit and gpt tables.
> Add addresses and IRQs for singletons like CCM if they need to be
> parameterised as well.
> 3: _init and _realize for the abstract class can then pull the tabular
> data out of the class to create.
> 4: define iMX25 and iMX31 which in their class_init populate all the
> tables using the data from the headers.
>
> See m25p80.c for an example of multiple dev definitions based on an
> abstract class and a table.

Maybe I don't understand what you want me to do but I don't feel there 
is enough commonalities between the i.MX31 and the i.MX25 that it is 
worth to design a common abstract class.

What I was wondering is if this would make sense for Qemu to build a 
board from a device tree ... Is this something that has been tackled 
somehow?

Anyway this can be done later and I don't think this need to be 
introduced right now.

>
> On Sun, Jul 5, 2015 at 5:05 PM, Jean-Christophe Dubois
> <jcd@tribudubois.net> wrote:
>> Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
>> ---
>>
>> Changes since v1:
>>      * not present on v1
>>
>> Changes since v2:
>>      * not present on v2
>>
>> Changes since v3:
>>      * not present on v3
>>
>> Changes since v4:
>>      * not present on v4
>>
>> Changes since v5:
>>      * not present on v5
>>
>> Changes since v6:
>>      * not present on v6
>>
>> Changes since v7:
>>      * Added a SOC specific file for i.MX25
>>
>> Changes since v8:
>>      * use defines instead of hardcoded values for IRQ and ADDR
>>      * reworked the memory allocation for SOC memory
>>
>> Changes since v9:
>>      * no change
>>
>>   default-configs/arm-softmmu.mak |   1 +
>>   hw/arm/Makefile.objs            |   1 +
>>   hw/arm/fsl-imx25.c              | 272 ++++++++++++++++++++++++++++++++++++++++
>>   include/hw/arm/fsl-imx25.h      | 234 ++++++++++++++++++++++++++++++++++
>>   4 files changed, 508 insertions(+)
>>   create mode 100644 hw/arm/fsl-imx25.c
>>   create mode 100644 include/hw/arm/fsl-imx25.h
>>
>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> index 5fa84c6..bf7572b 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -100,6 +100,7 @@ CONFIG_ALLWINNER_A10_PIC=y
>>   CONFIG_ALLWINNER_A10=y
>>
>>   CONFIG_FSL_IMX31=y
>> +CONFIG_FSL_IMX25=y
>>
>>   CONFIG_IMX_I2C=y
>>
>> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
>> index 2fbe344..b83aaca 100644
>> --- a/hw/arm/Makefile.objs
>> +++ b/hw/arm/Makefile.objs
>> @@ -13,4 +13,5 @@ obj-y += omap1.o omap2.o strongarm.o
>>   obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
>>   obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
>>   obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o
>> +obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o
>>   obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
>> diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
>> new file mode 100644
>> index 0000000..8325a9c
>> --- /dev/null
>> +++ b/hw/arm/fsl-imx25.c
>> @@ -0,0 +1,272 @@
>> +/*
>> + * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
>> + *
>> + * i.MX25 SOC emulation.
>> + *
>> + * Based on hw/arm/xlnx-zynqmp.c
>> + *
>> + * Copyright (C) 2015 Xilinx Inc
>> + * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>> + *
>> + *  This program is free software; you can redistribute it and/or modify it
>> + *  under the terms of the GNU General Public License as published by the
>> + *  Free Software Foundation; either version 2 of the License, or
>> + *  (at your option) any later version.
>> + *
>> + *  This program is distributed in the hope that it will be useful, but WITHOUT
>> + *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>> + *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
>> + *  for more details.
>> + *
>> + *  You should have received a copy of the GNU General Public License along
>> + *  with this program; if not, see <http://www.gnu.org/licenses/>.
>> + */
>> +
>> +#include "hw/arm/fsl-imx25.h"
>> +#include "sysemu/sysemu.h"
>> +#include "exec/address-spaces.h"
>> +
>> +static void fsl_imx25_init(Object *obj)
>> +{
>> +    FslImx25State *s = FSL_IMX25(obj);
>> +    int i;
>> +
>> +    object_initialize(&s->cpu, sizeof(s->cpu), "arm926-" TYPE_ARM_CPU);
>> +
>> +    object_initialize(&s->avic, sizeof(s->avic), TYPE_IMX_AVIC);
>> +    qdev_set_parent_bus(DEVICE(&s->avic), sysbus_get_default());
>> +
>> +    object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX_CCM);
>> +    qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default());
>> +
>> +    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
>> +        if (i >= MAX_SERIAL_PORTS) {
>> +            break;
>> +        }
>> +        object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_IMX_SERIAL);
>> +        qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());
>> +    }
>> +
>> +    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
>> +        object_initialize(&s->gpt[i], sizeof(s->gpt[i]), TYPE_IMX_GPT);
>> +        qdev_set_parent_bus(DEVICE(&s->gpt[i]), sysbus_get_default());
>> +    }
>> +
>> +    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
>> +        object_initialize(&s->epit[i], sizeof(s->epit[i]), TYPE_IMX_EPIT);
>> +        qdev_set_parent_bus(DEVICE(&s->epit[i]), sysbus_get_default());
>> +    }
>> +
>> +    object_initialize(&s->fec, sizeof(s->fec), TYPE_IMX_FEC);
>> +    qdev_set_parent_bus(DEVICE(&s->fec), sysbus_get_default());
>> +
>> +    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
>> +        object_initialize(&s->i2c[i], sizeof(s->i2c[i]), TYPE_IMX_I2C);
>> +        qdev_set_parent_bus(DEVICE(&s->i2c[i]), sysbus_get_default());
>> +    }
>> +}
>> +
>> +static void fsl_imx25_realize(DeviceState *dev, Error **errp)
>> +{
>> +    FslImx25State *s = FSL_IMX25(dev);
>> +    uint8_t i;
>> +    Error *err = NULL;
>> +
>> +    /* Initialize the CPU */
>> +    object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
>> +    if (err) {
>> +        error_propagate((errp), (err));
>> +        return;
>> +    }
>> +
>> +    /* Initialize the PIC */
>> +    object_property_set_bool(OBJECT(&s->avic), true, "realized", &err);
>> +    if (err) {
>> +        error_propagate((errp), (err));
>> +        return;
>> +    }
>> +    /* Connect the PIC interrupt to the CPU */
>> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->avic), 0, FSL_IMX25_AVIC_ADDR);
>> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 0,
>> +                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
>> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 1,
>> +                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
>> +
>> +    /* Initialize the CCM */
>> +    object_property_set_bool(OBJECT(&s->ccm), true, "realized", &err);
>> +    if (err) {
>> +        error_propagate((errp), (err));
>> +        return;
>> +    }
>> +    /* Map CCM memory */
>> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccm), 0, FSL_IMX25_CCM_ADDR);
>> +
>> +    /* Initialize all UARTS */
>> +    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
>> +        static const struct {
>> +            hwaddr addr;
>> +            unsigned int irq;
>> +        } serial_table[FSL_IMX25_NUM_UARTS] = {
>> +            { FSL_IMX25_UART1_ADDR, FSL_IMX25_UART1_IRQ },
>> +            { FSL_IMX25_UART2_ADDR, FSL_IMX25_UART2_IRQ },
>> +            { FSL_IMX25_UART3_ADDR, FSL_IMX25_UART3_IRQ },
>> +            { FSL_IMX25_UART4_ADDR, FSL_IMX25_UART4_IRQ  },
> Whitespace inconsistency.
>
>> +            { FSL_IMX25_UART5_ADDR, FSL_IMX25_UART5_IRQ }
>> +        };
>> +
>> +        /* Bail out if we exeeded Qemu UART count */
>> +        if (i >= MAX_SERIAL_PORTS) {
>> +            break;
>> +        }
>> +        /* Initialize the UART */
>> +        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);
>> +        if (err) {
>> +            error_propagate((errp), (err));
>> +            return;
>> +        }
>> +        /* Map UART memory */
>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, serial_table[i].addr);
>> +        /* Connet UART IRQ to PIC */
>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,
>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>> +                                            serial_table[i].irq));
>> +    }
>> +
>> +    /* Initialize all GPT timers */
>> +    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
>> +        static const struct {
>> +            hwaddr addr;
>> +            unsigned int irq;
>> +        } gpt_table[FSL_IMX25_NUM_GPTS] = {
>> +            { FSL_IMX25_GPT1_ADDR, FSL_IMX25_GPT1_IRQ },
>> +            { FSL_IMX25_GPT2_ADDR, FSL_IMX25_GPT2_IRQ },
>> +            { FSL_IMX25_GPT3_ADDR, FSL_IMX25_GPT3_IRQ },
>> +            { FSL_IMX25_GPT4_ADDR, FSL_IMX25_GPT4_IRQ }
>> +        };
>> +
>> +        s->gpt[i].ccm = DEVICE(&s->ccm);
>> +
>> +        /* Initialize the GPT */
>> +        object_property_set_bool(OBJECT(&s->gpt[i]), true, "realized", &err);
>> +        if (err) {
>> +            error_propagate((errp), (err));
>> +            return;
>> +        }
>> +        /* Map GPT memory */
>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt[i]), 0, gpt_table[i].addr);
>> +        /* Connet GPT IRQ to PIC */
>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt[i]), 0,
>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>> +                                            gpt_table[i].irq));
>> +    }
>> +
>> +    /* Initialize all EPIT timers */
>> +    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
>> +        static const struct {
>> +            hwaddr addr;
>> +            unsigned int irq;
>> +        } epit_table[FSL_IMX25_NUM_EPITS] = {
>> +            { FSL_IMX25_EPIT1_ADDR, FSL_IMX25_EPIT1_IRQ },
>> +            { FSL_IMX25_EPIT2_ADDR, FSL_IMX25_EPIT2_IRQ }
>> +        };
>> +
>> +        s->epit[i].ccm = DEVICE(&s->ccm);
>> +
>> +        /* Initialize the EPIT */
>> +        object_property_set_bool(OBJECT(&s->epit[i]), true, "realized", &err);
>> +        if (err) {
>> +            error_propagate((errp), (err));
>> +            return;
>> +        }
>> +        /* Map EPIT memory */
>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0, epit_table[i].addr);
>> +        /* Connet EPIT IRQ to PIC */
>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->epit[i]), 0,
>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>> +                                            epit_table[i].irq));
>> +    }
>> +
>> +    /* Initialize the FEC */
>> +    qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);
>> +    object_property_set_bool(OBJECT(&s->fec), true, "realized", &err);
>> +    if (err) {
>> +        error_propagate((errp), (err));
>> +        return;
>> +    }
>> +    /* Map FEC memory */
>> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->fec), 0, FSL_IMX25_FEC_ADDR);
>> +    /* Connet FEC IRQ to PIC */
>> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->fec), 0,
>> +                       qdev_get_gpio_in(DEVICE(&s->avic), FSL_IMX25_FEC_IRQ));
>> +
>> +
>> +    /* Initialize all I2C */
>> +    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
>> +        static const struct {
>> +            hwaddr addr;
>> +            unsigned int irq;
>> +        } i2c_table[FSL_IMX25_NUM_I2CS] = {
>> +            { FSL_IMX25_I2C1_ADDR, FSL_IMX25_I2C1_IRQ  },
>> +            { FSL_IMX25_I2C2_ADDR, FSL_IMX25_I2C2_IRQ  },
>> +            { FSL_IMX25_I2C3_ADDR, FSL_IMX25_I2C3_IRQ }
>> +        };
>> +
>> +        /* Initialize the I2C */
>> +        object_property_set_bool(OBJECT(&s->i2c[i]), true, "realized", &err);
>> +        if (err) {
>> +            error_propagate((errp), (err));
>> +            return;
>> +        }
>> +        /* Map I2C memory */
>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c[i]), 0, i2c_table[i].addr);
>> +        /* Connet I2C IRQ to PIC */
>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c[i]), 0,
>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>> +                                            i2c_table[i].irq));
>> +    }
>> +
>> +    /* initialize 2 x 16 KB ROM */
>> +    memory_region_init_rom_device(&s->rom[0], NULL, NULL, NULL,
>> +                                  "imx25.rom0", FSL_IMX25_ROM0_SIZE, &err);
>> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR,
>> +                                &s->rom[0]);
>> +    memory_region_init_rom_device(&s->rom[1], NULL, NULL, NULL,
>> +                                  "imx25.rom1", FSL_IMX25_ROM1_SIZE, &err);
>> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM1_ADDR,
>> +                                &s->rom[1]);
>> +
>> +    /* initialize internal RAM (128 KB) */
>> +    memory_region_init_ram(&s->iram, NULL, "imx25.iram", FSL_IMX25_IRAM_SIZE,
>> +                           &error_abort);
>> +    vmstate_register_ram_global(&s->iram);
>> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ADDR,
>> +                                &s->iram);
>> +
>> +    /* internal RAM (16 KB) is aliased over 128 MB - 128 KB */
>> +    memory_region_init_alias(&s->iram_alias, NULL, "imx25.iram_alias",
>> +                             &s->iram, 0, FSL_IMX25_IRAM_ALIAS_SIZE);
>> +    memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ALIAS_ADDR,
>> +                                &s->iram_alias);
>> +}
>> +
>> +static void fsl_imx25_class_init(ObjectClass *oc, void *data)
>> +{
>> +    DeviceClass *dc = DEVICE_CLASS(oc);
>> +
>> +    dc->realize = fsl_imx25_realize;
>> +}
>> +
>> +static const TypeInfo fsl_imx25_type_info = {
>> +    .name = TYPE_FSL_IMX25,
>> +    .parent = TYPE_DEVICE,
>> +    .instance_size = sizeof(FslImx25State),
>> +    .instance_init = fsl_imx25_init,
>> +    .class_init = fsl_imx25_class_init,
>> +};
>> +
>> +static void fsl_imx25_register_types(void)
>> +{
>> +    type_register_static(&fsl_imx25_type_info);
>> +}
>> +
>> +type_init(fsl_imx25_register_types)
>> diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
>> new file mode 100644
>> index 0000000..62691f9
>> --- /dev/null
>> +++ b/include/hw/arm/fsl-imx25.h
>> @@ -0,0 +1,234 @@
>> +/*
>> + * Freescale i.MX25 SoC emulation
>> + *
>> + * Copyright (C) 2015 Jean-Christophe Dubois <jcd@tribudubois.net>
>> + *
>> + * This program is free software; you can redistribute it and/or modify it
>> + * under the terms of the GNU General Public License as published by the
>> + * Free Software Foundation; either version 2 of the License, or
>> + * (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful, but WITHOUT
>> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
>> + * for more details.
>> + */
>> +
>> +#ifndef FSL_IMX25_H
>> +#define FSL_IMX25_H
>> +
>> +#include "hw/arm/arm.h"
>> +#include "hw/intc/imx_avic.h"
>> +#include "hw/misc/imx_ccm.h"
>> +#include "hw/char/imx_serial.h"
>> +#include "hw/timer/imx_gpt.h"
>> +#include "hw/timer/imx_epit.h"
>> +#include "hw/net/imx_fec.h"
>> +#include "hw/i2c/imx_i2c.h"
>> +#include "exec/memory.h"
>> +
>> +#define TYPE_FSL_IMX25 "fsl,imx25"
>> +#define FSL_IMX25(obj) OBJECT_CHECK(FslImx25State, (obj), TYPE_FSL_IMX25)
>> +
>> +#define FSL_IMX25_NUM_UARTS 5
>> +#define FSL_IMX25_NUM_GPTS 4
>> +#define FSL_IMX25_NUM_EPITS 2
>> +#define FSL_IMX25_NUM_I2CS 3
>> +
>> +typedef struct {
>> +    /*< private >*/
>> +    DeviceState parent_obj;
>> +
>> +    /*< public >*/
>> +    ARMCPU         cpu;
>> +    IMXAVICState   avic;
>> +    IMXCCMState    ccm;
>> +    IMXSerialState uart[FSL_IMX25_NUM_UARTS];
>> +    IMXGPTState    gpt[FSL_IMX25_NUM_GPTS];
>> +    IMXEPITState   epit[FSL_IMX25_NUM_EPITS];
>> +    IMXFECState    fec;
>> +    IMXI2CState    i2c[FSL_IMX25_NUM_I2CS];
>> +    MemoryRegion   rom[2];
>> +    MemoryRegion   iram;
>> +    MemoryRegion   iram_alias;
>> +} FslImx25State;
>> +
>> +/**
>> + * i.MX25 memory map
>> + ****************************************************************
>> + * 0x0000_0000 0x0000_3FFF 16 Kbytes   ROM (36 Kbytes)
>> + * 0x0000_4000 0x0040_3FFF 4 Mbytes    Reserved
>> + * 0x0040_4000 0x0040_8FFF 20 Kbytes   ROM (36 Kbytes)
>> + * 0x0040_9000 0x0FFF_FFFF 252 Mbytes (minus 36 Kbytes) Reserved
>> + * 0x1000_0000 0x1FFF_FFFF 256 Mbytes  Reserved
>> + * 0x2000_0000 0x2FFF_FFFF 256 Mbytes  Reserved
>> + * 0x3000_0000 0x3FFF_FFFF 256 Mbytes  Reserved
>> + * 0x4000_0000 0x43EF_FFFF 63 Mbytes   Reserved
>> + * 0x43F0_0000 0x43F0_3FFF 16 Kbytes   AIPS A control registers
>> + * 0x43F0_4000 0x43F0_7FFF 16 Kbytes   ARM926 platform MAX
>> + * 0x43F0_8000 0x43F0_BFFF 16 Kbytes   ARM926 platform CLKCTL
>> + * 0x43F0_C000 0x43F0_FFFF 16 Kbytes   ARM926 platform ETB registers
>> + * 0x43F1_0000 0x43F1_3FFF 16 Kbytes   ARM926 platform ETB memory
>> + * 0x43F1_4000 0x43F1_7FFF 16 Kbytes   ARM926 platform AAPE registers
>> + * 0x43F1_8000 0x43F7_FFFF 416 Kbytes  Reserved
>> + * 0x43F8_0000 0x43F8_3FFF 16 Kbytes   I2C-1
>> + * 0x43F8_4000 0x43F8_7FFF 16 Kbytes   I2C-3
>> + * 0x43F8_8000 0x43F8_BFFF 16 Kbytes   CAN-1
>> + * 0x43F8_C000 0x43F8_FFFF 16 Kbytes   CAN-2
>> + * 0x43F9_0000 0x43F9_3FFF 16 Kbytes   UART-1
>> + * 0x43F9_4000 0x43F9_7FFF 16 Kbytes   UART-2
>> + * 0x43F9_8000 0x43F9_BFFF 16 Kbytes   I2C-2
>> + * 0x43F9_C000 0x43F9_FFFF 16 Kbytes   1-Wire
>> + * 0x43FA_0000 0x43FA_3FFF 16 Kbytes   ATA (CPU side)
>> + * 0x43FA_4000 0x43FA_7FFF 16 Kbytes   CSPI-1
>> + * 0x43FA_8000 0x43FA_BFFF 16 Kbytes   KPP
>> + * 0x43FA_C000 0x43FA_FFFF 16 Kbytes   IOMUXC
>> + * 0x43FB_0000 0x43FB_3FFF 16 Kbytes   AUDMUX
>> + * 0x43FB_4000 0x43FB_7FFF 16 Kbytes   Reserved
>> + * 0x43FB_8000 0x43FB_BFFF 16 Kbytes   ECT (IP BUS A)
>> + * 0x43FB_C000 0x43FB_FFFF 16 Kbytes   ECT (IP BUS B)
>> + * 0x43FC_0000 0x43FF_FFFF 256 Kbytes  Reserved AIPS A off-platform slots
>> + * 0x4400_0000 0x4FFF_FFFF 192 Mbytes  Reserved
>> + * 0x5000_0000 0x5000_3FFF 16 Kbytes   SPBA base address
>> + * 0x5000_4000 0x5000_7FFF 16 Kbytes   CSPI-3
>> + * 0x5000_8000 0x5000_BFFF 16 Kbytes   UART-4
>> + * 0x5000_C000 0x5000_FFFF 16 Kbytes   UART-3
>> + * 0x5001_0000 0x5001_3FFF 16 Kbytes   CSPI-2
>> + * 0x5001_4000 0x5001_7FFF 16 Kbytes   SSI-2
>> + * 0x5001_C000 0x5001_FFFF 16 Kbytes   Reserved
>> + * 0x5002_0000 0x5002_3FFF 16 Kbytes   ATA
>> + * 0x5002_4000 0x5002_7FFF 16 Kbytes   SIM-1
>> + * 0x5002_8000 0x5002_BFFF 16 Kbytes   SIM-2
>> + * 0x5002_C000 0x5002_FFFF 16 Kbytes   UART-5
>> + * 0x5003_0000 0x5003_3FFF 16 Kbytes   TSC
>> + * 0x5003_4000 0x5003_7FFF 16 Kbytes   SSI-1
>> + * 0x5003_8000 0x5003_BFFF 16 Kbytes   FEC
>> + * 0x5003_C000 0x5003_FFFF 16 Kbytes   SPBA registers
>> + * 0x5004_0000 0x51FF_FFFF 32 Mbytes (minus 256 Kbytes)
>> + * 0x5200_0000 0x53EF_FFFF 31 Mbytes   Reserved
>> + * 0x53F0_0000 0x53F0_3FFF 16 Kbytes   AIPS B control registers
>> + * 0x53F0_4000 0x53F7_FFFF 496 Kbytes  Reserved
>> + * 0x53F8_0000 0x53F8_3FFF 16 Kbytes   CCM
>> + * 0x53F8_4000 0x53F8_7FFF 16 Kbytes   GPT-4
>> + * 0x53F8_8000 0x53F8_BFFF 16 Kbytes   GPT-3
>> + * 0x53F8_C000 0x53F8_FFFF 16 Kbytes   GPT-2
>> + * 0x53F9_0000 0x53F9_3FFF 16 Kbytes   GPT-1
>> + * 0x53F9_4000 0x53F9_7FFF 16 Kbytes   EPIT-1
>> + * 0x53F9_8000 0x53F9_BFFF 16 Kbytes   EPIT-2
>> + * 0x53F9_C000 0x53F9_FFFF 16 Kbytes   GPIO-4
>> + * 0x53FA_0000 0x53FA_3FFF 16 Kbytes   PWM-2
>> + * 0x53FA_4000 0x53FA_7FFF 16 Kbytes   GPIO-3
>> + * 0x53FA_8000 0x53FA_BFFF 16 Kbytes   PWM-3
>> + * 0x53FA_C000 0x53FA_FFFF 16 Kbytes   SCC
>> + * 0x53FB_0000 0x53FB_3FFF 16 Kbytes   RNGB
>> + * 0x53FB_4000 0x53FB_7FFF 16 Kbytes   eSDHC-1
>> + * 0x53FB_8000 0x53FB_BFFF 16 Kbytes   eSDHC-2
>> + * 0x53FB_C000 0x53FB_FFFF 16 Kbytes   LCDC
>> + * 0x53FC_0000 0x53FC_3FFF 16 Kbytes   SLCDC
>> + * 0x53FC_4000 0x53FC_7FFF 16 Kbytes   Reserved
>> + * 0x53FC_8000 0x53FC_BFFF 16 Kbytes   PWM-4
>> + * 0x53FC_C000 0x53FC_FFFF 16 Kbytes   GPIO-1
>> + * 0x53FD_0000 0x53FD_3FFF 16 Kbytes   GPIO-2
>> + * 0x53FD_4000 0x53FD_7FFF 16 Kbytes   SDMA
>> + * 0x53FD_8000 0x53FD_BFFF 16 Kbytes   Reserved
>> + * 0x53FD_C000 0x53FD_FFFF 16 Kbytes   WDOG
>> + * 0x53FE_0000 0x53FE_3FFF 16 Kbytes   PWM-1
>> + * 0x53FE_4000 0x53FE_7FFF 16 Kbytes   Reserved
>> + * 0x53FE_8000 0x53FE_BFFF 16 Kbytes   Reserved
>> + * 0x53FE_C000 0x53FE_FFFF 16 Kbytes   RTICv3
>> + * 0x53FF_0000 0x53FF_3FFF 16 Kbytes   IIM
>> + * 0x53FF_4000 0x53FF_7FFF 16 Kbytes   USB
>> + * 0x53FF_8000 0x53FF_BFFF 16 Kbytes   CSI
>> + * 0x53FF_C000 0x53FF_FFFF 16 Kbytes   DryIce
>> + * 0x5400_0000 0x5FFF_FFFF 192 Mbytes  Reserved (aliased AIPS B slots)
>> + * 0x6000_0000 0x67FF_FFFF 128 Mbytes  ARM926 platform ROMPATCH
>> + * 0x6800_0000 0x6FFF_FFFF 128 Mbytes  ARM926 platform ASIC
>> + * 0x7000_0000 0x77FF_FFFF 128 Mbytes  Reserved
>> + * 0x7800_0000 0x7801_FFFF 128 Kbytes  RAM
>> + * 0x7802_0000 0x7FFF_FFFF 128 Mbytes (minus 128 Kbytes)
>> + * 0x8000_0000 0x8FFF_FFFF 256 Mbytes  SDRAM bank 0
>> + * 0x9000_0000 0x9FFF_FFFF 256 Mbytes  SDRAM bank 1
>> + * 0xA000_0000 0xA7FF_FFFF 128 Mbytes  WEIM CS0 (flash 128) 1
>> + * 0xA800_0000 0xAFFF_FFFF 128 Mbytes  WEIM CS1 (flash 64) 1
>> + * 0xB000_0000 0xB1FF_FFFF 32 Mbytes   WEIM CS2 (SRAM)
>> + * 0xB200_0000 0xB3FF_FFFF 32 Mbytes   WEIM CS3 (SRAM)
>> + * 0xB400_0000 0xB5FF_FFFF 32 Mbytes   WEIM CS4
>> + * 0xB600_0000 0xB7FF_FFFF 32 Mbytes   Reserved
>> + * 0xB800_0000 0xB800_0FFF 4 Kbytes    Reserved
>> + * 0xB800_1000 0xB800_1FFF 4 Kbytes    SDRAM control registers
>> + * 0xB800_2000 0xB800_2FFF 4 Kbytes    WEIM control registers
>> + * 0xB800_3000 0xB800_3FFF 4 Kbytes    M3IF control registers
>> + * 0xB800_4000 0xB800_4FFF 4 Kbytes    EMI control registers
>> + * 0xB800_5000 0xBAFF_FFFF 32 Mbytes (minus 20 Kbytes)
>> + * 0xBB00_0000 0xBB00_0FFF 4 Kbytes    NAND flash main area buffer
>> + * 0xBB00_1000 0xBB00_11FF 512 B       NAND flash spare area buffer
>> + * 0xBB00_1200 0xBB00_1DFF 3 Kbytes    Reserved
>> + * 0xBB00_1E00 0xBB00_1FFF 512 B       NAND flash control regisers
>> + * 0xBB01_2000 0xBFFF_FFFF 96 Mbytes (minus 8 Kbytes) Reserved
>> + * 0xC000_0000 0xFFFF_FFFF 1024 Mbytes Reserved
>> + */
>> +
>> +#define FSL_IMX25_ROM0_ADDR    0x00000000
>> +#define FSL_IMX25_ROM0_SIZE    0x4000
>> +#define FSL_IMX25_ROM1_ADDR    0x00404000
>> +#define FSL_IMX25_ROM1_SIZE    0x4000
>> +#define FSL_IMX25_I2C1_ADDR    0x43F80000
>> +#define FSL_IMX25_I2C1_SIZE    0x4000
>> +#define FSL_IMX25_I2C3_ADDR    0x43F84000
>> +#define FSL_IMX25_I2C3_SIZE    0x4000
>> +#define FSL_IMX25_UART1_ADDR   0x43F90000
>> +#define FSL_IMX25_UART1_SIZE   0x4000
>> +#define FSL_IMX25_UART2_ADDR   0x43F94000
>> +#define FSL_IMX25_UART2_SIZE   0x4000
>> +#define FSL_IMX25_I2C2_ADDR    0x43F98000
>> +#define FSL_IMX25_I2C2_SIZE    0x4000
>> +#define FSL_IMX25_UART4_ADDR   0x50008000
>> +#define FSL_IMX25_UART4_SIZE   0x4000
>> +#define FSL_IMX25_UART3_ADDR   0x5000C000
>> +#define FSL_IMX25_UART3_SIZE   0x4000
>> +#define FSL_IMX25_UART5_ADDR   0x5002C000
>> +#define FSL_IMX25_UART5_SIZE   0x4000
>> +#define FSL_IMX25_FEC_ADDR     0x50038000
>> +#define FSL_IMX25_FEC_SIZE     0x4000
>> +#define FSL_IMX25_CCM_ADDR     0x53F80000
>> +#define FSL_IMX25_CCM_SIZE     0x4000
>> +#define FSL_IMX25_GPT4_ADDR    0x53F84000
>> +#define FSL_IMX25_GPT4_SIZE    0x4000
>> +#define FSL_IMX25_GPT3_ADDR    0x53F88000
>> +#define FSL_IMX25_GPT3_SIZE    0x4000
>> +#define FSL_IMX25_GPT2_ADDR    0x53F8C000
>> +#define FSL_IMX25_GPT2_SIZE    0x4000
>> +#define FSL_IMX25_GPT1_ADDR    0x53F90000
>> +#define FSL_IMX25_GPT1_SIZE    0x4000
>> +#define FSL_IMX25_EPIT1_ADDR   0x53F94000
>> +#define FSL_IMX25_EPIT1_SIZE   0x4000
>> +#define FSL_IMX25_EPIT2_ADDR   0x53F98000
>> +#define FSL_IMX25_EPIT2_SIZE   0x4000
>> +#define FSL_IMX25_AVIC_ADDR    0x68000000
>> +#define FSL_IMX25_AVIC_SIZE    0x4000
>> +#define FSL_IMX25_IRAM_ADDR    0x78000000
>> +#define FSL_IMX25_IRAM_SIZE    0x20000
>> +#define FSL_IMX25_IRAM_ALIAS_ADDR      0x78020000
>> +#define FSL_IMX25_IRAM_ALIAS_SIZE      0x7FE0000
>> +#define FSL_IMX25_SDRAM0_ADDR  0x80000000
>> +#define FSL_IMX25_SDRAM0_SIZE  0x10000000
>> +#define FSL_IMX25_SDRAM1_ADDR  0x90000000
>> +#define FSL_IMX25_SDRAM1_SIZE  0x10000000
>> +
>> +#define FSL_IMX25_UART1_IRQ    45
>> +#define FSL_IMX25_UART2_IRQ    32
>> +#define FSL_IMX25_UART3_IRQ    18
>> +#define FSL_IMX25_UART4_IRQ    5
>> +#define FSL_IMX25_UART5_IRQ    40
>> +#define FSL_IMX25_GPT1_IRQ     54
>> +#define FSL_IMX25_GPT2_IRQ     53
>> +#define FSL_IMX25_GPT3_IRQ     29
>> +#define FSL_IMX25_GPT4_IRQ     1
>> +#define FSL_IMX25_EPIT1_IRQ    28
>> +#define FSL_IMX25_EPIT2_IRQ    27
>> +#define FSL_IMX25_FEC_IRQ      57
>> +#define FSL_IMX25_I2C1_IRQ     3
>> +#define FSL_IMX25_I2C2_IRQ     4
>> +#define FSL_IMX25_I2C3_IRQ     10
>> +
>> +#endif // FSL_IMX25_H
> C++ comment.
>
> Regards,
> Peter
>
>> --
>> 2.1.4
>>
>>
Peter Crosthwaite July 8, 2015, 8:32 p.m. UTC | #3
On Wed, Jul 8, 2015 at 10:58 AM, Jean-Christophe DUBOIS
<jcd@tribudubois.net> wrote:
> Le 06/07/2015 09:42, Peter Crosthwaite a écrit :
>>
>> Many of the same comments I had before for IMX31 apply.
>>
>> Liviu, CCd is actually working on a simlar problem for multiple SoCs
>> of the same family using a mostly the same definition. I think the
>> same applies to the i.MXxx families.
>>
>> How I suggest this can one can be done to avoid the code dup is:
>>
>> 1: create a base abstract class for the SoC. TYPE_IMX "fxl,imxxx"
>> 2: define class struct members for your serial epit and gpt tables.
>> Add addresses and IRQs for singletons like CCM if they need to be
>> parameterised as well.
>> 3: _init and _realize for the abstract class can then pull the tabular
>> data out of the class to create.
>> 4: define iMX25 and iMX31 which in their class_init populate all the
>> tables using the data from the headers.
>>
>> See m25p80.c for an example of multiple dev definitions based on an
>> abstract class and a table.
>
>
> Maybe I don't understand what you want me to do but I don't feel there is
> enough commonalities between the i.MX31 and the i.MX25 that it is worth to
> design a common abstract class.
>
> What I was wondering is if this would make sense for Qemu to build a board
> from a device tree ... Is this something that has been tackled somehow?
>

CC some people, and yes :). It is fully working in the Xilinx QEMU
tree although I don't have it in clean enough state for another spin.

http://lists.gnu.org/archive/html/qemu-devel/2012-09/msg02437.html

We have done a fair bit since then.

Regards,
Peter

> Anyway this can be done later and I don't think this need to be introduced
> right now.
>
>
>>
>> On Sun, Jul 5, 2015 at 5:05 PM, Jean-Christophe Dubois
>> <jcd@tribudubois.net> wrote:
>>>
>>> Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
>>> ---
>>>
>>> Changes since v1:
>>>      * not present on v1
>>>
>>> Changes since v2:
>>>      * not present on v2
>>>
>>> Changes since v3:
>>>      * not present on v3
>>>
>>> Changes since v4:
>>>      * not present on v4
>>>
>>> Changes since v5:
>>>      * not present on v5
>>>
>>> Changes since v6:
>>>      * not present on v6
>>>
>>> Changes since v7:
>>>      * Added a SOC specific file for i.MX25
>>>
>>> Changes since v8:
>>>      * use defines instead of hardcoded values for IRQ and ADDR
>>>      * reworked the memory allocation for SOC memory
>>>
>>> Changes since v9:
>>>      * no change
>>>
>>>   default-configs/arm-softmmu.mak |   1 +
>>>   hw/arm/Makefile.objs            |   1 +
>>>   hw/arm/fsl-imx25.c              | 272
>>> ++++++++++++++++++++++++++++++++++++++++
>>>   include/hw/arm/fsl-imx25.h      | 234
>>> ++++++++++++++++++++++++++++++++++
>>>   4 files changed, 508 insertions(+)
>>>   create mode 100644 hw/arm/fsl-imx25.c
>>>   create mode 100644 include/hw/arm/fsl-imx25.h
>>>
>>> diff --git a/default-configs/arm-softmmu.mak
>>> b/default-configs/arm-softmmu.mak
>>> index 5fa84c6..bf7572b 100644
>>> --- a/default-configs/arm-softmmu.mak
>>> +++ b/default-configs/arm-softmmu.mak
>>> @@ -100,6 +100,7 @@ CONFIG_ALLWINNER_A10_PIC=y
>>>   CONFIG_ALLWINNER_A10=y
>>>
>>>   CONFIG_FSL_IMX31=y
>>> +CONFIG_FSL_IMX25=y
>>>
>>>   CONFIG_IMX_I2C=y
>>>
>>> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
>>> index 2fbe344..b83aaca 100644
>>> --- a/hw/arm/Makefile.objs
>>> +++ b/hw/arm/Makefile.objs
>>> @@ -13,4 +13,5 @@ obj-y += omap1.o omap2.o strongarm.o
>>>   obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
>>>   obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
>>>   obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o
>>> +obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o
>>>   obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
>>> diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
>>> new file mode 100644
>>> index 0000000..8325a9c
>>> --- /dev/null
>>> +++ b/hw/arm/fsl-imx25.c
>>> @@ -0,0 +1,272 @@
>>> +/*
>>> + * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
>>> + *
>>> + * i.MX25 SOC emulation.
>>> + *
>>> + * Based on hw/arm/xlnx-zynqmp.c
>>> + *
>>> + * Copyright (C) 2015 Xilinx Inc
>>> + * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>>> + *
>>> + *  This program is free software; you can redistribute it and/or modify
>>> it
>>> + *  under the terms of the GNU General Public License as published by
>>> the
>>> + *  Free Software Foundation; either version 2 of the License, or
>>> + *  (at your option) any later version.
>>> + *
>>> + *  This program is distributed in the hope that it will be useful, but
>>> WITHOUT
>>> + *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
>>> or
>>> + *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
>>> + *  for more details.
>>> + *
>>> + *  You should have received a copy of the GNU General Public License
>>> along
>>> + *  with this program; if not, see <http://www.gnu.org/licenses/>.
>>> + */
>>> +
>>> +#include "hw/arm/fsl-imx25.h"
>>> +#include "sysemu/sysemu.h"
>>> +#include "exec/address-spaces.h"
>>> +
>>> +static void fsl_imx25_init(Object *obj)
>>> +{
>>> +    FslImx25State *s = FSL_IMX25(obj);
>>> +    int i;
>>> +
>>> +    object_initialize(&s->cpu, sizeof(s->cpu), "arm926-" TYPE_ARM_CPU);
>>> +
>>> +    object_initialize(&s->avic, sizeof(s->avic), TYPE_IMX_AVIC);
>>> +    qdev_set_parent_bus(DEVICE(&s->avic), sysbus_get_default());
>>> +
>>> +    object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX_CCM);
>>> +    qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default());
>>> +
>>> +    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
>>> +        if (i >= MAX_SERIAL_PORTS) {
>>> +            break;
>>> +        }
>>> +        object_initialize(&s->uart[i], sizeof(s->uart[i]),
>>> TYPE_IMX_SERIAL);
>>> +        qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());
>>> +    }
>>> +
>>> +    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
>>> +        object_initialize(&s->gpt[i], sizeof(s->gpt[i]), TYPE_IMX_GPT);
>>> +        qdev_set_parent_bus(DEVICE(&s->gpt[i]), sysbus_get_default());
>>> +    }
>>> +
>>> +    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
>>> +        object_initialize(&s->epit[i], sizeof(s->epit[i]),
>>> TYPE_IMX_EPIT);
>>> +        qdev_set_parent_bus(DEVICE(&s->epit[i]), sysbus_get_default());
>>> +    }
>>> +
>>> +    object_initialize(&s->fec, sizeof(s->fec), TYPE_IMX_FEC);
>>> +    qdev_set_parent_bus(DEVICE(&s->fec), sysbus_get_default());
>>> +
>>> +    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
>>> +        object_initialize(&s->i2c[i], sizeof(s->i2c[i]), TYPE_IMX_I2C);
>>> +        qdev_set_parent_bus(DEVICE(&s->i2c[i]), sysbus_get_default());
>>> +    }
>>> +}
>>> +
>>> +static void fsl_imx25_realize(DeviceState *dev, Error **errp)
>>> +{
>>> +    FslImx25State *s = FSL_IMX25(dev);
>>> +    uint8_t i;
>>> +    Error *err = NULL;
>>> +
>>> +    /* Initialize the CPU */
>>> +    object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
>>> +    if (err) {
>>> +        error_propagate((errp), (err));
>>> +        return;
>>> +    }
>>> +
>>> +    /* Initialize the PIC */
>>> +    object_property_set_bool(OBJECT(&s->avic), true, "realized", &err);
>>> +    if (err) {
>>> +        error_propagate((errp), (err));
>>> +        return;
>>> +    }
>>> +    /* Connect the PIC interrupt to the CPU */
>>> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->avic), 0, FSL_IMX25_AVIC_ADDR);
>>> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 0,
>>> +                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
>>> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 1,
>>> +                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
>>> +
>>> +    /* Initialize the CCM */
>>> +    object_property_set_bool(OBJECT(&s->ccm), true, "realized", &err);
>>> +    if (err) {
>>> +        error_propagate((errp), (err));
>>> +        return;
>>> +    }
>>> +    /* Map CCM memory */
>>> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccm), 0, FSL_IMX25_CCM_ADDR);
>>> +
>>> +    /* Initialize all UARTS */
>>> +    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
>>> +        static const struct {
>>> +            hwaddr addr;
>>> +            unsigned int irq;
>>> +        } serial_table[FSL_IMX25_NUM_UARTS] = {
>>> +            { FSL_IMX25_UART1_ADDR, FSL_IMX25_UART1_IRQ },
>>> +            { FSL_IMX25_UART2_ADDR, FSL_IMX25_UART2_IRQ },
>>> +            { FSL_IMX25_UART3_ADDR, FSL_IMX25_UART3_IRQ },
>>> +            { FSL_IMX25_UART4_ADDR, FSL_IMX25_UART4_IRQ  },
>>
>> Whitespace inconsistency.
>>
>>> +            { FSL_IMX25_UART5_ADDR, FSL_IMX25_UART5_IRQ }
>>> +        };
>>> +
>>> +        /* Bail out if we exeeded Qemu UART count */
>>> +        if (i >= MAX_SERIAL_PORTS) {
>>> +            break;
>>> +        }
>>> +        /* Initialize the UART */
>>> +        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized",
>>> &err);
>>> +        if (err) {
>>> +            error_propagate((errp), (err));
>>> +            return;
>>> +        }
>>> +        /* Map UART memory */
>>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0,
>>> serial_table[i].addr);
>>> +        /* Connet UART IRQ to PIC */
>>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,
>>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>>> +                                            serial_table[i].irq));
>>> +    }
>>> +
>>> +    /* Initialize all GPT timers */
>>> +    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
>>> +        static const struct {
>>> +            hwaddr addr;
>>> +            unsigned int irq;
>>> +        } gpt_table[FSL_IMX25_NUM_GPTS] = {
>>> +            { FSL_IMX25_GPT1_ADDR, FSL_IMX25_GPT1_IRQ },
>>> +            { FSL_IMX25_GPT2_ADDR, FSL_IMX25_GPT2_IRQ },
>>> +            { FSL_IMX25_GPT3_ADDR, FSL_IMX25_GPT3_IRQ },
>>> +            { FSL_IMX25_GPT4_ADDR, FSL_IMX25_GPT4_IRQ }
>>> +        };
>>> +
>>> +        s->gpt[i].ccm = DEVICE(&s->ccm);
>>> +
>>> +        /* Initialize the GPT */
>>> +        object_property_set_bool(OBJECT(&s->gpt[i]), true, "realized",
>>> &err);
>>> +        if (err) {
>>> +            error_propagate((errp), (err));
>>> +            return;
>>> +        }
>>> +        /* Map GPT memory */
>>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt[i]), 0,
>>> gpt_table[i].addr);
>>> +        /* Connet GPT IRQ to PIC */
>>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt[i]), 0,
>>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>>> +                                            gpt_table[i].irq));
>>> +    }
>>> +
>>> +    /* Initialize all EPIT timers */
>>> +    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
>>> +        static const struct {
>>> +            hwaddr addr;
>>> +            unsigned int irq;
>>> +        } epit_table[FSL_IMX25_NUM_EPITS] = {
>>> +            { FSL_IMX25_EPIT1_ADDR, FSL_IMX25_EPIT1_IRQ },
>>> +            { FSL_IMX25_EPIT2_ADDR, FSL_IMX25_EPIT2_IRQ }
>>> +        };
>>> +
>>> +        s->epit[i].ccm = DEVICE(&s->ccm);
>>> +
>>> +        /* Initialize the EPIT */
>>> +        object_property_set_bool(OBJECT(&s->epit[i]), true, "realized",
>>> &err);
>>> +        if (err) {
>>> +            error_propagate((errp), (err));
>>> +            return;
>>> +        }
>>> +        /* Map EPIT memory */
>>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0,
>>> epit_table[i].addr);
>>> +        /* Connet EPIT IRQ to PIC */
>>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->epit[i]), 0,
>>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>>> +                                            epit_table[i].irq));
>>> +    }
>>> +
>>> +    /* Initialize the FEC */
>>> +    qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);
>>> +    object_property_set_bool(OBJECT(&s->fec), true, "realized", &err);
>>> +    if (err) {
>>> +        error_propagate((errp), (err));
>>> +        return;
>>> +    }
>>> +    /* Map FEC memory */
>>> +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->fec), 0, FSL_IMX25_FEC_ADDR);
>>> +    /* Connet FEC IRQ to PIC */
>>> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->fec), 0,
>>> +                       qdev_get_gpio_in(DEVICE(&s->avic),
>>> FSL_IMX25_FEC_IRQ));
>>> +
>>> +
>>> +    /* Initialize all I2C */
>>> +    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
>>> +        static const struct {
>>> +            hwaddr addr;
>>> +            unsigned int irq;
>>> +        } i2c_table[FSL_IMX25_NUM_I2CS] = {
>>> +            { FSL_IMX25_I2C1_ADDR, FSL_IMX25_I2C1_IRQ  },
>>> +            { FSL_IMX25_I2C2_ADDR, FSL_IMX25_I2C2_IRQ  },
>>> +            { FSL_IMX25_I2C3_ADDR, FSL_IMX25_I2C3_IRQ }
>>> +        };
>>> +
>>> +        /* Initialize the I2C */
>>> +        object_property_set_bool(OBJECT(&s->i2c[i]), true, "realized",
>>> &err);
>>> +        if (err) {
>>> +            error_propagate((errp), (err));
>>> +            return;
>>> +        }
>>> +        /* Map I2C memory */
>>> +        sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c[i]), 0,
>>> i2c_table[i].addr);
>>> +        /* Connet I2C IRQ to PIC */
>>> +        sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c[i]), 0,
>>> +                           qdev_get_gpio_in(DEVICE(&s->avic),
>>> +                                            i2c_table[i].irq));
>>> +    }
>>> +
>>> +    /* initialize 2 x 16 KB ROM */
>>> +    memory_region_init_rom_device(&s->rom[0], NULL, NULL, NULL,
>>> +                                  "imx25.rom0", FSL_IMX25_ROM0_SIZE,
>>> &err);
>>> +    memory_region_add_subregion(get_system_memory(),
>>> FSL_IMX25_ROM0_ADDR,
>>> +                                &s->rom[0]);
>>> +    memory_region_init_rom_device(&s->rom[1], NULL, NULL, NULL,
>>> +                                  "imx25.rom1", FSL_IMX25_ROM1_SIZE,
>>> &err);
>>> +    memory_region_add_subregion(get_system_memory(),
>>> FSL_IMX25_ROM1_ADDR,
>>> +                                &s->rom[1]);
>>> +
>>> +    /* initialize internal RAM (128 KB) */
>>> +    memory_region_init_ram(&s->iram, NULL, "imx25.iram",
>>> FSL_IMX25_IRAM_SIZE,
>>> +                           &error_abort);
>>> +    vmstate_register_ram_global(&s->iram);
>>> +    memory_region_add_subregion(get_system_memory(),
>>> FSL_IMX25_IRAM_ADDR,
>>> +                                &s->iram);
>>> +
>>> +    /* internal RAM (16 KB) is aliased over 128 MB - 128 KB */
>>> +    memory_region_init_alias(&s->iram_alias, NULL, "imx25.iram_alias",
>>> +                             &s->iram, 0, FSL_IMX25_IRAM_ALIAS_SIZE);
>>> +    memory_region_add_subregion(get_system_memory(),
>>> FSL_IMX25_IRAM_ALIAS_ADDR,
>>> +                                &s->iram_alias);
>>> +}
>>> +
>>> +static void fsl_imx25_class_init(ObjectClass *oc, void *data)
>>> +{
>>> +    DeviceClass *dc = DEVICE_CLASS(oc);
>>> +
>>> +    dc->realize = fsl_imx25_realize;
>>> +}
>>> +
>>> +static const TypeInfo fsl_imx25_type_info = {
>>> +    .name = TYPE_FSL_IMX25,
>>> +    .parent = TYPE_DEVICE,
>>> +    .instance_size = sizeof(FslImx25State),
>>> +    .instance_init = fsl_imx25_init,
>>> +    .class_init = fsl_imx25_class_init,
>>> +};
>>> +
>>> +static void fsl_imx25_register_types(void)
>>> +{
>>> +    type_register_static(&fsl_imx25_type_info);
>>> +}
>>> +
>>> +type_init(fsl_imx25_register_types)
>>> diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
>>> new file mode 100644
>>> index 0000000..62691f9
>>> --- /dev/null
>>> +++ b/include/hw/arm/fsl-imx25.h
>>> @@ -0,0 +1,234 @@
>>> +/*
>>> + * Freescale i.MX25 SoC emulation
>>> + *
>>> + * Copyright (C) 2015 Jean-Christophe Dubois <jcd@tribudubois.net>
>>> + *
>>> + * This program is free software; you can redistribute it and/or modify
>>> it
>>> + * under the terms of the GNU General Public License as published by the
>>> + * Free Software Foundation; either version 2 of the License, or
>>> + * (at your option) any later version.
>>> + *
>>> + * This program is distributed in the hope that it will be useful, but
>>> WITHOUT
>>> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>>> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
>>> + * for more details.
>>> + */
>>> +
>>> +#ifndef FSL_IMX25_H
>>> +#define FSL_IMX25_H
>>> +
>>> +#include "hw/arm/arm.h"
>>> +#include "hw/intc/imx_avic.h"
>>> +#include "hw/misc/imx_ccm.h"
>>> +#include "hw/char/imx_serial.h"
>>> +#include "hw/timer/imx_gpt.h"
>>> +#include "hw/timer/imx_epit.h"
>>> +#include "hw/net/imx_fec.h"
>>> +#include "hw/i2c/imx_i2c.h"
>>> +#include "exec/memory.h"
>>> +
>>> +#define TYPE_FSL_IMX25 "fsl,imx25"
>>> +#define FSL_IMX25(obj) OBJECT_CHECK(FslImx25State, (obj),
>>> TYPE_FSL_IMX25)
>>> +
>>> +#define FSL_IMX25_NUM_UARTS 5
>>> +#define FSL_IMX25_NUM_GPTS 4
>>> +#define FSL_IMX25_NUM_EPITS 2
>>> +#define FSL_IMX25_NUM_I2CS 3
>>> +
>>> +typedef struct {
>>> +    /*< private >*/
>>> +    DeviceState parent_obj;
>>> +
>>> +    /*< public >*/
>>> +    ARMCPU         cpu;
>>> +    IMXAVICState   avic;
>>> +    IMXCCMState    ccm;
>>> +    IMXSerialState uart[FSL_IMX25_NUM_UARTS];
>>> +    IMXGPTState    gpt[FSL_IMX25_NUM_GPTS];
>>> +    IMXEPITState   epit[FSL_IMX25_NUM_EPITS];
>>> +    IMXFECState    fec;
>>> +    IMXI2CState    i2c[FSL_IMX25_NUM_I2CS];
>>> +    MemoryRegion   rom[2];
>>> +    MemoryRegion   iram;
>>> +    MemoryRegion   iram_alias;
>>> +} FslImx25State;
>>> +
>>> +/**
>>> + * i.MX25 memory map
>>> + ****************************************************************
>>> + * 0x0000_0000 0x0000_3FFF 16 Kbytes   ROM (36 Kbytes)
>>> + * 0x0000_4000 0x0040_3FFF 4 Mbytes    Reserved
>>> + * 0x0040_4000 0x0040_8FFF 20 Kbytes   ROM (36 Kbytes)
>>> + * 0x0040_9000 0x0FFF_FFFF 252 Mbytes (minus 36 Kbytes) Reserved
>>> + * 0x1000_0000 0x1FFF_FFFF 256 Mbytes  Reserved
>>> + * 0x2000_0000 0x2FFF_FFFF 256 Mbytes  Reserved
>>> + * 0x3000_0000 0x3FFF_FFFF 256 Mbytes  Reserved
>>> + * 0x4000_0000 0x43EF_FFFF 63 Mbytes   Reserved
>>> + * 0x43F0_0000 0x43F0_3FFF 16 Kbytes   AIPS A control registers
>>> + * 0x43F0_4000 0x43F0_7FFF 16 Kbytes   ARM926 platform MAX
>>> + * 0x43F0_8000 0x43F0_BFFF 16 Kbytes   ARM926 platform CLKCTL
>>> + * 0x43F0_C000 0x43F0_FFFF 16 Kbytes   ARM926 platform ETB registers
>>> + * 0x43F1_0000 0x43F1_3FFF 16 Kbytes   ARM926 platform ETB memory
>>> + * 0x43F1_4000 0x43F1_7FFF 16 Kbytes   ARM926 platform AAPE registers
>>> + * 0x43F1_8000 0x43F7_FFFF 416 Kbytes  Reserved
>>> + * 0x43F8_0000 0x43F8_3FFF 16 Kbytes   I2C-1
>>> + * 0x43F8_4000 0x43F8_7FFF 16 Kbytes   I2C-3
>>> + * 0x43F8_8000 0x43F8_BFFF 16 Kbytes   CAN-1
>>> + * 0x43F8_C000 0x43F8_FFFF 16 Kbytes   CAN-2
>>> + * 0x43F9_0000 0x43F9_3FFF 16 Kbytes   UART-1
>>> + * 0x43F9_4000 0x43F9_7FFF 16 Kbytes   UART-2
>>> + * 0x43F9_8000 0x43F9_BFFF 16 Kbytes   I2C-2
>>> + * 0x43F9_C000 0x43F9_FFFF 16 Kbytes   1-Wire
>>> + * 0x43FA_0000 0x43FA_3FFF 16 Kbytes   ATA (CPU side)
>>> + * 0x43FA_4000 0x43FA_7FFF 16 Kbytes   CSPI-1
>>> + * 0x43FA_8000 0x43FA_BFFF 16 Kbytes   KPP
>>> + * 0x43FA_C000 0x43FA_FFFF 16 Kbytes   IOMUXC
>>> + * 0x43FB_0000 0x43FB_3FFF 16 Kbytes   AUDMUX
>>> + * 0x43FB_4000 0x43FB_7FFF 16 Kbytes   Reserved
>>> + * 0x43FB_8000 0x43FB_BFFF 16 Kbytes   ECT (IP BUS A)
>>> + * 0x43FB_C000 0x43FB_FFFF 16 Kbytes   ECT (IP BUS B)
>>> + * 0x43FC_0000 0x43FF_FFFF 256 Kbytes  Reserved AIPS A off-platform
>>> slots
>>> + * 0x4400_0000 0x4FFF_FFFF 192 Mbytes  Reserved
>>> + * 0x5000_0000 0x5000_3FFF 16 Kbytes   SPBA base address
>>> + * 0x5000_4000 0x5000_7FFF 16 Kbytes   CSPI-3
>>> + * 0x5000_8000 0x5000_BFFF 16 Kbytes   UART-4
>>> + * 0x5000_C000 0x5000_FFFF 16 Kbytes   UART-3
>>> + * 0x5001_0000 0x5001_3FFF 16 Kbytes   CSPI-2
>>> + * 0x5001_4000 0x5001_7FFF 16 Kbytes   SSI-2
>>> + * 0x5001_C000 0x5001_FFFF 16 Kbytes   Reserved
>>> + * 0x5002_0000 0x5002_3FFF 16 Kbytes   ATA
>>> + * 0x5002_4000 0x5002_7FFF 16 Kbytes   SIM-1
>>> + * 0x5002_8000 0x5002_BFFF 16 Kbytes   SIM-2
>>> + * 0x5002_C000 0x5002_FFFF 16 Kbytes   UART-5
>>> + * 0x5003_0000 0x5003_3FFF 16 Kbytes   TSC
>>> + * 0x5003_4000 0x5003_7FFF 16 Kbytes   SSI-1
>>> + * 0x5003_8000 0x5003_BFFF 16 Kbytes   FEC
>>> + * 0x5003_C000 0x5003_FFFF 16 Kbytes   SPBA registers
>>> + * 0x5004_0000 0x51FF_FFFF 32 Mbytes (minus 256 Kbytes)
>>> + * 0x5200_0000 0x53EF_FFFF 31 Mbytes   Reserved
>>> + * 0x53F0_0000 0x53F0_3FFF 16 Kbytes   AIPS B control registers
>>> + * 0x53F0_4000 0x53F7_FFFF 496 Kbytes  Reserved
>>> + * 0x53F8_0000 0x53F8_3FFF 16 Kbytes   CCM
>>> + * 0x53F8_4000 0x53F8_7FFF 16 Kbytes   GPT-4
>>> + * 0x53F8_8000 0x53F8_BFFF 16 Kbytes   GPT-3
>>> + * 0x53F8_C000 0x53F8_FFFF 16 Kbytes   GPT-2
>>> + * 0x53F9_0000 0x53F9_3FFF 16 Kbytes   GPT-1
>>> + * 0x53F9_4000 0x53F9_7FFF 16 Kbytes   EPIT-1
>>> + * 0x53F9_8000 0x53F9_BFFF 16 Kbytes   EPIT-2
>>> + * 0x53F9_C000 0x53F9_FFFF 16 Kbytes   GPIO-4
>>> + * 0x53FA_0000 0x53FA_3FFF 16 Kbytes   PWM-2
>>> + * 0x53FA_4000 0x53FA_7FFF 16 Kbytes   GPIO-3
>>> + * 0x53FA_8000 0x53FA_BFFF 16 Kbytes   PWM-3
>>> + * 0x53FA_C000 0x53FA_FFFF 16 Kbytes   SCC
>>> + * 0x53FB_0000 0x53FB_3FFF 16 Kbytes   RNGB
>>> + * 0x53FB_4000 0x53FB_7FFF 16 Kbytes   eSDHC-1
>>> + * 0x53FB_8000 0x53FB_BFFF 16 Kbytes   eSDHC-2
>>> + * 0x53FB_C000 0x53FB_FFFF 16 Kbytes   LCDC
>>> + * 0x53FC_0000 0x53FC_3FFF 16 Kbytes   SLCDC
>>> + * 0x53FC_4000 0x53FC_7FFF 16 Kbytes   Reserved
>>> + * 0x53FC_8000 0x53FC_BFFF 16 Kbytes   PWM-4
>>> + * 0x53FC_C000 0x53FC_FFFF 16 Kbytes   GPIO-1
>>> + * 0x53FD_0000 0x53FD_3FFF 16 Kbytes   GPIO-2
>>> + * 0x53FD_4000 0x53FD_7FFF 16 Kbytes   SDMA
>>> + * 0x53FD_8000 0x53FD_BFFF 16 Kbytes   Reserved
>>> + * 0x53FD_C000 0x53FD_FFFF 16 Kbytes   WDOG
>>> + * 0x53FE_0000 0x53FE_3FFF 16 Kbytes   PWM-1
>>> + * 0x53FE_4000 0x53FE_7FFF 16 Kbytes   Reserved
>>> + * 0x53FE_8000 0x53FE_BFFF 16 Kbytes   Reserved
>>> + * 0x53FE_C000 0x53FE_FFFF 16 Kbytes   RTICv3
>>> + * 0x53FF_0000 0x53FF_3FFF 16 Kbytes   IIM
>>> + * 0x53FF_4000 0x53FF_7FFF 16 Kbytes   USB
>>> + * 0x53FF_8000 0x53FF_BFFF 16 Kbytes   CSI
>>> + * 0x53FF_C000 0x53FF_FFFF 16 Kbytes   DryIce
>>> + * 0x5400_0000 0x5FFF_FFFF 192 Mbytes  Reserved (aliased AIPS B slots)
>>> + * 0x6000_0000 0x67FF_FFFF 128 Mbytes  ARM926 platform ROMPATCH
>>> + * 0x6800_0000 0x6FFF_FFFF 128 Mbytes  ARM926 platform ASIC
>>> + * 0x7000_0000 0x77FF_FFFF 128 Mbytes  Reserved
>>> + * 0x7800_0000 0x7801_FFFF 128 Kbytes  RAM
>>> + * 0x7802_0000 0x7FFF_FFFF 128 Mbytes (minus 128 Kbytes)
>>> + * 0x8000_0000 0x8FFF_FFFF 256 Mbytes  SDRAM bank 0
>>> + * 0x9000_0000 0x9FFF_FFFF 256 Mbytes  SDRAM bank 1
>>> + * 0xA000_0000 0xA7FF_FFFF 128 Mbytes  WEIM CS0 (flash 128) 1
>>> + * 0xA800_0000 0xAFFF_FFFF 128 Mbytes  WEIM CS1 (flash 64) 1
>>> + * 0xB000_0000 0xB1FF_FFFF 32 Mbytes   WEIM CS2 (SRAM)
>>> + * 0xB200_0000 0xB3FF_FFFF 32 Mbytes   WEIM CS3 (SRAM)
>>> + * 0xB400_0000 0xB5FF_FFFF 32 Mbytes   WEIM CS4
>>> + * 0xB600_0000 0xB7FF_FFFF 32 Mbytes   Reserved
>>> + * 0xB800_0000 0xB800_0FFF 4 Kbytes    Reserved
>>> + * 0xB800_1000 0xB800_1FFF 4 Kbytes    SDRAM control registers
>>> + * 0xB800_2000 0xB800_2FFF 4 Kbytes    WEIM control registers
>>> + * 0xB800_3000 0xB800_3FFF 4 Kbytes    M3IF control registers
>>> + * 0xB800_4000 0xB800_4FFF 4 Kbytes    EMI control registers
>>> + * 0xB800_5000 0xBAFF_FFFF 32 Mbytes (minus 20 Kbytes)
>>> + * 0xBB00_0000 0xBB00_0FFF 4 Kbytes    NAND flash main area buffer
>>> + * 0xBB00_1000 0xBB00_11FF 512 B       NAND flash spare area buffer
>>> + * 0xBB00_1200 0xBB00_1DFF 3 Kbytes    Reserved
>>> + * 0xBB00_1E00 0xBB00_1FFF 512 B       NAND flash control regisers
>>> + * 0xBB01_2000 0xBFFF_FFFF 96 Mbytes (minus 8 Kbytes) Reserved
>>> + * 0xC000_0000 0xFFFF_FFFF 1024 Mbytes Reserved
>>> + */
>>> +
>>> +#define FSL_IMX25_ROM0_ADDR    0x00000000
>>> +#define FSL_IMX25_ROM0_SIZE    0x4000
>>> +#define FSL_IMX25_ROM1_ADDR    0x00404000
>>> +#define FSL_IMX25_ROM1_SIZE    0x4000
>>> +#define FSL_IMX25_I2C1_ADDR    0x43F80000
>>> +#define FSL_IMX25_I2C1_SIZE    0x4000
>>> +#define FSL_IMX25_I2C3_ADDR    0x43F84000
>>> +#define FSL_IMX25_I2C3_SIZE    0x4000
>>> +#define FSL_IMX25_UART1_ADDR   0x43F90000
>>> +#define FSL_IMX25_UART1_SIZE   0x4000
>>> +#define FSL_IMX25_UART2_ADDR   0x43F94000
>>> +#define FSL_IMX25_UART2_SIZE   0x4000
>>> +#define FSL_IMX25_I2C2_ADDR    0x43F98000
>>> +#define FSL_IMX25_I2C2_SIZE    0x4000
>>> +#define FSL_IMX25_UART4_ADDR   0x50008000
>>> +#define FSL_IMX25_UART4_SIZE   0x4000
>>> +#define FSL_IMX25_UART3_ADDR   0x5000C000
>>> +#define FSL_IMX25_UART3_SIZE   0x4000
>>> +#define FSL_IMX25_UART5_ADDR   0x5002C000
>>> +#define FSL_IMX25_UART5_SIZE   0x4000
>>> +#define FSL_IMX25_FEC_ADDR     0x50038000
>>> +#define FSL_IMX25_FEC_SIZE     0x4000
>>> +#define FSL_IMX25_CCM_ADDR     0x53F80000
>>> +#define FSL_IMX25_CCM_SIZE     0x4000
>>> +#define FSL_IMX25_GPT4_ADDR    0x53F84000
>>> +#define FSL_IMX25_GPT4_SIZE    0x4000
>>> +#define FSL_IMX25_GPT3_ADDR    0x53F88000
>>> +#define FSL_IMX25_GPT3_SIZE    0x4000
>>> +#define FSL_IMX25_GPT2_ADDR    0x53F8C000
>>> +#define FSL_IMX25_GPT2_SIZE    0x4000
>>> +#define FSL_IMX25_GPT1_ADDR    0x53F90000
>>> +#define FSL_IMX25_GPT1_SIZE    0x4000
>>> +#define FSL_IMX25_EPIT1_ADDR   0x53F94000
>>> +#define FSL_IMX25_EPIT1_SIZE   0x4000
>>> +#define FSL_IMX25_EPIT2_ADDR   0x53F98000
>>> +#define FSL_IMX25_EPIT2_SIZE   0x4000
>>> +#define FSL_IMX25_AVIC_ADDR    0x68000000
>>> +#define FSL_IMX25_AVIC_SIZE    0x4000
>>> +#define FSL_IMX25_IRAM_ADDR    0x78000000
>>> +#define FSL_IMX25_IRAM_SIZE    0x20000
>>> +#define FSL_IMX25_IRAM_ALIAS_ADDR      0x78020000
>>> +#define FSL_IMX25_IRAM_ALIAS_SIZE      0x7FE0000
>>> +#define FSL_IMX25_SDRAM0_ADDR  0x80000000
>>> +#define FSL_IMX25_SDRAM0_SIZE  0x10000000
>>> +#define FSL_IMX25_SDRAM1_ADDR  0x90000000
>>> +#define FSL_IMX25_SDRAM1_SIZE  0x10000000
>>> +
>>> +#define FSL_IMX25_UART1_IRQ    45
>>> +#define FSL_IMX25_UART2_IRQ    32
>>> +#define FSL_IMX25_UART3_IRQ    18
>>> +#define FSL_IMX25_UART4_IRQ    5
>>> +#define FSL_IMX25_UART5_IRQ    40
>>> +#define FSL_IMX25_GPT1_IRQ     54
>>> +#define FSL_IMX25_GPT2_IRQ     53
>>> +#define FSL_IMX25_GPT3_IRQ     29
>>> +#define FSL_IMX25_GPT4_IRQ     1
>>> +#define FSL_IMX25_EPIT1_IRQ    28
>>> +#define FSL_IMX25_EPIT2_IRQ    27
>>> +#define FSL_IMX25_FEC_IRQ      57
>>> +#define FSL_IMX25_I2C1_IRQ     3
>>> +#define FSL_IMX25_I2C2_IRQ     4
>>> +#define FSL_IMX25_I2C3_IRQ     10
>>> +
>>> +#endif // FSL_IMX25_H
>>
>> C++ comment.
>>
>> Regards,
>> Peter
>>
>>> --
>>> 2.1.4
>>>
>>>
>
>
diff mbox

Patch

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 5fa84c6..bf7572b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -100,6 +100,7 @@  CONFIG_ALLWINNER_A10_PIC=y
 CONFIG_ALLWINNER_A10=y
 
 CONFIG_FSL_IMX31=y
+CONFIG_FSL_IMX25=y
 
 CONFIG_IMX_I2C=y
 
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 2fbe344..b83aaca 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -13,4 +13,5 @@  obj-y += omap1.o omap2.o strongarm.o
 obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
 obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
 obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o
+obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o
 obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
new file mode 100644
index 0000000..8325a9c
--- /dev/null
+++ b/hw/arm/fsl-imx25.c
@@ -0,0 +1,272 @@ 
+/*
+ * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
+ *
+ * i.MX25 SOC emulation.
+ *
+ * Based on hw/arm/xlnx-zynqmp.c
+ *
+ * Copyright (C) 2015 Xilinx Inc
+ * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "hw/arm/fsl-imx25.h"
+#include "sysemu/sysemu.h"
+#include "exec/address-spaces.h"
+
+static void fsl_imx25_init(Object *obj)
+{
+    FslImx25State *s = FSL_IMX25(obj);
+    int i;
+
+    object_initialize(&s->cpu, sizeof(s->cpu), "arm926-" TYPE_ARM_CPU);
+
+    object_initialize(&s->avic, sizeof(s->avic), TYPE_IMX_AVIC);
+    qdev_set_parent_bus(DEVICE(&s->avic), sysbus_get_default());
+
+    object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX_CCM);
+    qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default());
+
+    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
+        if (i >= MAX_SERIAL_PORTS) {
+            break;
+        }
+        object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_IMX_SERIAL);
+        qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());
+    }
+
+    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
+        object_initialize(&s->gpt[i], sizeof(s->gpt[i]), TYPE_IMX_GPT);
+        qdev_set_parent_bus(DEVICE(&s->gpt[i]), sysbus_get_default());
+    }
+
+    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
+        object_initialize(&s->epit[i], sizeof(s->epit[i]), TYPE_IMX_EPIT);
+        qdev_set_parent_bus(DEVICE(&s->epit[i]), sysbus_get_default());
+    }
+
+    object_initialize(&s->fec, sizeof(s->fec), TYPE_IMX_FEC);
+    qdev_set_parent_bus(DEVICE(&s->fec), sysbus_get_default());
+
+    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
+        object_initialize(&s->i2c[i], sizeof(s->i2c[i]), TYPE_IMX_I2C);
+        qdev_set_parent_bus(DEVICE(&s->i2c[i]), sysbus_get_default());
+    }
+}
+
+static void fsl_imx25_realize(DeviceState *dev, Error **errp)
+{
+    FslImx25State *s = FSL_IMX25(dev);
+    uint8_t i;
+    Error *err = NULL;
+
+    /* Initialize the CPU */
+    object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
+    if (err) {
+        error_propagate((errp), (err));
+        return;
+    }
+
+    /* Initialize the PIC */
+    object_property_set_bool(OBJECT(&s->avic), true, "realized", &err);
+    if (err) {
+        error_propagate((errp), (err));
+        return;
+    }
+    /* Connect the PIC interrupt to the CPU */
+    sysbus_mmio_map(SYS_BUS_DEVICE(&s->avic), 0, FSL_IMX25_AVIC_ADDR);
+    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 0,
+                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
+    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 1,
+                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
+
+    /* Initialize the CCM */
+    object_property_set_bool(OBJECT(&s->ccm), true, "realized", &err);
+    if (err) {
+        error_propagate((errp), (err));
+        return;
+    }
+    /* Map CCM memory */
+    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccm), 0, FSL_IMX25_CCM_ADDR);
+
+    /* Initialize all UARTS */
+    for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
+        static const struct {
+            hwaddr addr;
+            unsigned int irq;
+        } serial_table[FSL_IMX25_NUM_UARTS] = {
+            { FSL_IMX25_UART1_ADDR, FSL_IMX25_UART1_IRQ },
+            { FSL_IMX25_UART2_ADDR, FSL_IMX25_UART2_IRQ },
+            { FSL_IMX25_UART3_ADDR, FSL_IMX25_UART3_IRQ },
+            { FSL_IMX25_UART4_ADDR, FSL_IMX25_UART4_IRQ  },
+            { FSL_IMX25_UART5_ADDR, FSL_IMX25_UART5_IRQ }
+        };
+
+        /* Bail out if we exeeded Qemu UART count */
+        if (i >= MAX_SERIAL_PORTS) {
+            break;
+        }
+        /* Initialize the UART */
+        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);
+        if (err) {
+            error_propagate((errp), (err));
+            return;
+        }
+        /* Map UART memory */
+        sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, serial_table[i].addr);
+        /* Connet UART IRQ to PIC */
+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,
+                           qdev_get_gpio_in(DEVICE(&s->avic),
+                                            serial_table[i].irq));
+    }
+
+    /* Initialize all GPT timers */
+    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
+        static const struct {
+            hwaddr addr;
+            unsigned int irq;
+        } gpt_table[FSL_IMX25_NUM_GPTS] = {
+            { FSL_IMX25_GPT1_ADDR, FSL_IMX25_GPT1_IRQ },
+            { FSL_IMX25_GPT2_ADDR, FSL_IMX25_GPT2_IRQ },
+            { FSL_IMX25_GPT3_ADDR, FSL_IMX25_GPT3_IRQ },
+            { FSL_IMX25_GPT4_ADDR, FSL_IMX25_GPT4_IRQ }
+        };
+
+        s->gpt[i].ccm = DEVICE(&s->ccm);
+
+        /* Initialize the GPT */
+        object_property_set_bool(OBJECT(&s->gpt[i]), true, "realized", &err);
+        if (err) {
+            error_propagate((errp), (err));
+            return;
+        }
+        /* Map GPT memory */
+        sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt[i]), 0, gpt_table[i].addr);
+        /* Connet GPT IRQ to PIC */
+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt[i]), 0,
+                           qdev_get_gpio_in(DEVICE(&s->avic),
+                                            gpt_table[i].irq));
+    }
+
+    /* Initialize all EPIT timers */
+    for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
+        static const struct {
+            hwaddr addr;
+            unsigned int irq;
+        } epit_table[FSL_IMX25_NUM_EPITS] = {
+            { FSL_IMX25_EPIT1_ADDR, FSL_IMX25_EPIT1_IRQ },
+            { FSL_IMX25_EPIT2_ADDR, FSL_IMX25_EPIT2_IRQ }
+        };
+
+        s->epit[i].ccm = DEVICE(&s->ccm);
+
+        /* Initialize the EPIT */
+        object_property_set_bool(OBJECT(&s->epit[i]), true, "realized", &err);
+        if (err) {
+            error_propagate((errp), (err));
+            return;
+        }
+        /* Map EPIT memory */
+        sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0, epit_table[i].addr);
+        /* Connet EPIT IRQ to PIC */
+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->epit[i]), 0,
+                           qdev_get_gpio_in(DEVICE(&s->avic),
+                                            epit_table[i].irq));
+    }
+
+    /* Initialize the FEC */
+    qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);
+    object_property_set_bool(OBJECT(&s->fec), true, "realized", &err);
+    if (err) {
+        error_propagate((errp), (err));
+        return;
+    }
+    /* Map FEC memory */
+    sysbus_mmio_map(SYS_BUS_DEVICE(&s->fec), 0, FSL_IMX25_FEC_ADDR);
+    /* Connet FEC IRQ to PIC */
+    sysbus_connect_irq(SYS_BUS_DEVICE(&s->fec), 0,
+                       qdev_get_gpio_in(DEVICE(&s->avic), FSL_IMX25_FEC_IRQ));
+
+
+    /* Initialize all I2C */
+    for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
+        static const struct {
+            hwaddr addr;
+            unsigned int irq;
+        } i2c_table[FSL_IMX25_NUM_I2CS] = {
+            { FSL_IMX25_I2C1_ADDR, FSL_IMX25_I2C1_IRQ  },
+            { FSL_IMX25_I2C2_ADDR, FSL_IMX25_I2C2_IRQ  },
+            { FSL_IMX25_I2C3_ADDR, FSL_IMX25_I2C3_IRQ }
+        };
+
+        /* Initialize the I2C */
+        object_property_set_bool(OBJECT(&s->i2c[i]), true, "realized", &err);
+        if (err) {
+            error_propagate((errp), (err));
+            return;
+        }
+        /* Map I2C memory */
+        sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c[i]), 0, i2c_table[i].addr);
+        /* Connet I2C IRQ to PIC */
+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c[i]), 0,
+                           qdev_get_gpio_in(DEVICE(&s->avic),
+                                            i2c_table[i].irq));
+    }
+
+    /* initialize 2 x 16 KB ROM */
+    memory_region_init_rom_device(&s->rom[0], NULL, NULL, NULL,
+                                  "imx25.rom0", FSL_IMX25_ROM0_SIZE, &err);
+    memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR,
+                                &s->rom[0]);
+    memory_region_init_rom_device(&s->rom[1], NULL, NULL, NULL,
+                                  "imx25.rom1", FSL_IMX25_ROM1_SIZE, &err);
+    memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM1_ADDR,
+                                &s->rom[1]);
+
+    /* initialize internal RAM (128 KB) */
+    memory_region_init_ram(&s->iram, NULL, "imx25.iram", FSL_IMX25_IRAM_SIZE,
+                           &error_abort);
+    vmstate_register_ram_global(&s->iram);
+    memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ADDR,
+                                &s->iram);
+
+    /* internal RAM (16 KB) is aliased over 128 MB - 128 KB */
+    memory_region_init_alias(&s->iram_alias, NULL, "imx25.iram_alias",
+                             &s->iram, 0, FSL_IMX25_IRAM_ALIAS_SIZE);
+    memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ALIAS_ADDR,
+                                &s->iram_alias);
+}
+
+static void fsl_imx25_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+
+    dc->realize = fsl_imx25_realize;
+}
+
+static const TypeInfo fsl_imx25_type_info = {
+    .name = TYPE_FSL_IMX25,
+    .parent = TYPE_DEVICE,
+    .instance_size = sizeof(FslImx25State),
+    .instance_init = fsl_imx25_init,
+    .class_init = fsl_imx25_class_init,
+};
+
+static void fsl_imx25_register_types(void)
+{
+    type_register_static(&fsl_imx25_type_info);
+}
+
+type_init(fsl_imx25_register_types)
diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
new file mode 100644
index 0000000..62691f9
--- /dev/null
+++ b/include/hw/arm/fsl-imx25.h
@@ -0,0 +1,234 @@ 
+/*
+ * Freescale i.MX25 SoC emulation
+ *
+ * Copyright (C) 2015 Jean-Christophe Dubois <jcd@tribudubois.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef FSL_IMX25_H
+#define FSL_IMX25_H
+
+#include "hw/arm/arm.h"
+#include "hw/intc/imx_avic.h"
+#include "hw/misc/imx_ccm.h"
+#include "hw/char/imx_serial.h"
+#include "hw/timer/imx_gpt.h"
+#include "hw/timer/imx_epit.h"
+#include "hw/net/imx_fec.h"
+#include "hw/i2c/imx_i2c.h"
+#include "exec/memory.h"
+
+#define TYPE_FSL_IMX25 "fsl,imx25"
+#define FSL_IMX25(obj) OBJECT_CHECK(FslImx25State, (obj), TYPE_FSL_IMX25)
+
+#define FSL_IMX25_NUM_UARTS 5
+#define FSL_IMX25_NUM_GPTS 4
+#define FSL_IMX25_NUM_EPITS 2
+#define FSL_IMX25_NUM_I2CS 3
+
+typedef struct {
+    /*< private >*/
+    DeviceState parent_obj;
+
+    /*< public >*/
+    ARMCPU         cpu;
+    IMXAVICState   avic;
+    IMXCCMState    ccm;
+    IMXSerialState uart[FSL_IMX25_NUM_UARTS];
+    IMXGPTState    gpt[FSL_IMX25_NUM_GPTS];
+    IMXEPITState   epit[FSL_IMX25_NUM_EPITS];
+    IMXFECState    fec;
+    IMXI2CState    i2c[FSL_IMX25_NUM_I2CS];
+    MemoryRegion   rom[2];
+    MemoryRegion   iram;
+    MemoryRegion   iram_alias;
+} FslImx25State;
+
+/**
+ * i.MX25 memory map
+ ****************************************************************
+ * 0x0000_0000 0x0000_3FFF 16 Kbytes	ROM (36 Kbytes)
+ * 0x0000_4000 0x0040_3FFF 4 Mbytes	Reserved
+ * 0x0040_4000 0x0040_8FFF 20 Kbytes	ROM (36 Kbytes)
+ * 0x0040_9000 0x0FFF_FFFF 252 Mbytes (minus 36 Kbytes) Reserved
+ * 0x1000_0000 0x1FFF_FFFF 256 Mbytes	Reserved
+ * 0x2000_0000 0x2FFF_FFFF 256 Mbytes	Reserved
+ * 0x3000_0000 0x3FFF_FFFF 256 Mbytes	Reserved
+ * 0x4000_0000 0x43EF_FFFF 63 Mbytes	Reserved
+ * 0x43F0_0000 0x43F0_3FFF 16 Kbytes	AIPS A control registers
+ * 0x43F0_4000 0x43F0_7FFF 16 Kbytes	ARM926 platform MAX
+ * 0x43F0_8000 0x43F0_BFFF 16 Kbytes	ARM926 platform CLKCTL
+ * 0x43F0_C000 0x43F0_FFFF 16 Kbytes	ARM926 platform ETB registers
+ * 0x43F1_0000 0x43F1_3FFF 16 Kbytes	ARM926 platform ETB memory
+ * 0x43F1_4000 0x43F1_7FFF 16 Kbytes	ARM926 platform AAPE registers
+ * 0x43F1_8000 0x43F7_FFFF 416 Kbytes	Reserved
+ * 0x43F8_0000 0x43F8_3FFF 16 Kbytes	I2C-1
+ * 0x43F8_4000 0x43F8_7FFF 16 Kbytes	I2C-3
+ * 0x43F8_8000 0x43F8_BFFF 16 Kbytes	CAN-1
+ * 0x43F8_C000 0x43F8_FFFF 16 Kbytes	CAN-2
+ * 0x43F9_0000 0x43F9_3FFF 16 Kbytes	UART-1
+ * 0x43F9_4000 0x43F9_7FFF 16 Kbytes	UART-2
+ * 0x43F9_8000 0x43F9_BFFF 16 Kbytes	I2C-2
+ * 0x43F9_C000 0x43F9_FFFF 16 Kbytes	1-Wire
+ * 0x43FA_0000 0x43FA_3FFF 16 Kbytes	ATA (CPU side)
+ * 0x43FA_4000 0x43FA_7FFF 16 Kbytes	CSPI-1
+ * 0x43FA_8000 0x43FA_BFFF 16 Kbytes	KPP
+ * 0x43FA_C000 0x43FA_FFFF 16 Kbytes	IOMUXC
+ * 0x43FB_0000 0x43FB_3FFF 16 Kbytes	AUDMUX
+ * 0x43FB_4000 0x43FB_7FFF 16 Kbytes	Reserved
+ * 0x43FB_8000 0x43FB_BFFF 16 Kbytes	ECT (IP BUS A)
+ * 0x43FB_C000 0x43FB_FFFF 16 Kbytes	ECT (IP BUS B)
+ * 0x43FC_0000 0x43FF_FFFF 256 Kbytes	Reserved AIPS A off-platform slots
+ * 0x4400_0000 0x4FFF_FFFF 192 Mbytes	Reserved
+ * 0x5000_0000 0x5000_3FFF 16 Kbytes	SPBA base address
+ * 0x5000_4000 0x5000_7FFF 16 Kbytes	CSPI-3
+ * 0x5000_8000 0x5000_BFFF 16 Kbytes	UART-4
+ * 0x5000_C000 0x5000_FFFF 16 Kbytes	UART-3
+ * 0x5001_0000 0x5001_3FFF 16 Kbytes	CSPI-2
+ * 0x5001_4000 0x5001_7FFF 16 Kbytes	SSI-2
+ * 0x5001_C000 0x5001_FFFF 16 Kbytes	Reserved
+ * 0x5002_0000 0x5002_3FFF 16 Kbytes	ATA
+ * 0x5002_4000 0x5002_7FFF 16 Kbytes	SIM-1
+ * 0x5002_8000 0x5002_BFFF 16 Kbytes	SIM-2
+ * 0x5002_C000 0x5002_FFFF 16 Kbytes	UART-5
+ * 0x5003_0000 0x5003_3FFF 16 Kbytes	TSC
+ * 0x5003_4000 0x5003_7FFF 16 Kbytes	SSI-1
+ * 0x5003_8000 0x5003_BFFF 16 Kbytes	FEC
+ * 0x5003_C000 0x5003_FFFF 16 Kbytes	SPBA registers
+ * 0x5004_0000 0x51FF_FFFF 32 Mbytes (minus 256 Kbytes)
+ * 0x5200_0000 0x53EF_FFFF 31 Mbytes	Reserved
+ * 0x53F0_0000 0x53F0_3FFF 16 Kbytes	AIPS B control registers
+ * 0x53F0_4000 0x53F7_FFFF 496 Kbytes	Reserved
+ * 0x53F8_0000 0x53F8_3FFF 16 Kbytes	CCM
+ * 0x53F8_4000 0x53F8_7FFF 16 Kbytes	GPT-4
+ * 0x53F8_8000 0x53F8_BFFF 16 Kbytes	GPT-3
+ * 0x53F8_C000 0x53F8_FFFF 16 Kbytes	GPT-2
+ * 0x53F9_0000 0x53F9_3FFF 16 Kbytes	GPT-1
+ * 0x53F9_4000 0x53F9_7FFF 16 Kbytes	EPIT-1
+ * 0x53F9_8000 0x53F9_BFFF 16 Kbytes	EPIT-2
+ * 0x53F9_C000 0x53F9_FFFF 16 Kbytes	GPIO-4
+ * 0x53FA_0000 0x53FA_3FFF 16 Kbytes	PWM-2
+ * 0x53FA_4000 0x53FA_7FFF 16 Kbytes	GPIO-3
+ * 0x53FA_8000 0x53FA_BFFF 16 Kbytes	PWM-3
+ * 0x53FA_C000 0x53FA_FFFF 16 Kbytes	SCC
+ * 0x53FB_0000 0x53FB_3FFF 16 Kbytes	RNGB
+ * 0x53FB_4000 0x53FB_7FFF 16 Kbytes	eSDHC-1
+ * 0x53FB_8000 0x53FB_BFFF 16 Kbytes	eSDHC-2
+ * 0x53FB_C000 0x53FB_FFFF 16 Kbytes	LCDC
+ * 0x53FC_0000 0x53FC_3FFF 16 Kbytes	SLCDC
+ * 0x53FC_4000 0x53FC_7FFF 16 Kbytes	Reserved
+ * 0x53FC_8000 0x53FC_BFFF 16 Kbytes	PWM-4
+ * 0x53FC_C000 0x53FC_FFFF 16 Kbytes	GPIO-1
+ * 0x53FD_0000 0x53FD_3FFF 16 Kbytes	GPIO-2
+ * 0x53FD_4000 0x53FD_7FFF 16 Kbytes	SDMA
+ * 0x53FD_8000 0x53FD_BFFF 16 Kbytes	Reserved
+ * 0x53FD_C000 0x53FD_FFFF 16 Kbytes	WDOG
+ * 0x53FE_0000 0x53FE_3FFF 16 Kbytes	PWM-1
+ * 0x53FE_4000 0x53FE_7FFF 16 Kbytes	Reserved
+ * 0x53FE_8000 0x53FE_BFFF 16 Kbytes	Reserved
+ * 0x53FE_C000 0x53FE_FFFF 16 Kbytes	RTICv3
+ * 0x53FF_0000 0x53FF_3FFF 16 Kbytes	IIM
+ * 0x53FF_4000 0x53FF_7FFF 16 Kbytes	USB
+ * 0x53FF_8000 0x53FF_BFFF 16 Kbytes	CSI
+ * 0x53FF_C000 0x53FF_FFFF 16 Kbytes	DryIce
+ * 0x5400_0000 0x5FFF_FFFF 192 Mbytes	Reserved (aliased AIPS B slots)
+ * 0x6000_0000 0x67FF_FFFF 128 Mbytes	ARM926 platform ROMPATCH
+ * 0x6800_0000 0x6FFF_FFFF 128 Mbytes	ARM926 platform ASIC
+ * 0x7000_0000 0x77FF_FFFF 128 Mbytes	Reserved
+ * 0x7800_0000 0x7801_FFFF 128 Kbytes	RAM
+ * 0x7802_0000 0x7FFF_FFFF 128 Mbytes (minus 128 Kbytes)
+ * 0x8000_0000 0x8FFF_FFFF 256 Mbytes	SDRAM bank 0
+ * 0x9000_0000 0x9FFF_FFFF 256 Mbytes	SDRAM bank 1
+ * 0xA000_0000 0xA7FF_FFFF 128 Mbytes	WEIM CS0 (flash 128) 1
+ * 0xA800_0000 0xAFFF_FFFF 128 Mbytes	WEIM CS1 (flash 64) 1
+ * 0xB000_0000 0xB1FF_FFFF 32 Mbytes	WEIM CS2 (SRAM)
+ * 0xB200_0000 0xB3FF_FFFF 32 Mbytes	WEIM CS3 (SRAM)
+ * 0xB400_0000 0xB5FF_FFFF 32 Mbytes	WEIM CS4
+ * 0xB600_0000 0xB7FF_FFFF 32 Mbytes	Reserved
+ * 0xB800_0000 0xB800_0FFF 4 Kbytes	Reserved
+ * 0xB800_1000 0xB800_1FFF 4 Kbytes	SDRAM control registers
+ * 0xB800_2000 0xB800_2FFF 4 Kbytes	WEIM control registers
+ * 0xB800_3000 0xB800_3FFF 4 Kbytes	M3IF control registers
+ * 0xB800_4000 0xB800_4FFF 4 Kbytes	EMI control registers
+ * 0xB800_5000 0xBAFF_FFFF 32 Mbytes (minus 20 Kbytes)
+ * 0xBB00_0000 0xBB00_0FFF 4 Kbytes	NAND flash main area buffer
+ * 0xBB00_1000 0xBB00_11FF 512 B	NAND flash spare area buffer
+ * 0xBB00_1200 0xBB00_1DFF 3 Kbytes	Reserved
+ * 0xBB00_1E00 0xBB00_1FFF 512 B	NAND flash control regisers
+ * 0xBB01_2000 0xBFFF_FFFF 96 Mbytes (minus 8 Kbytes) Reserved
+ * 0xC000_0000 0xFFFF_FFFF 1024 Mbytes	Reserved
+ */
+
+#define FSL_IMX25_ROM0_ADDR	0x00000000
+#define FSL_IMX25_ROM0_SIZE	0x4000
+#define FSL_IMX25_ROM1_ADDR	0x00404000
+#define FSL_IMX25_ROM1_SIZE	0x4000
+#define FSL_IMX25_I2C1_ADDR	0x43F80000
+#define FSL_IMX25_I2C1_SIZE	0x4000
+#define FSL_IMX25_I2C3_ADDR	0x43F84000
+#define FSL_IMX25_I2C3_SIZE	0x4000
+#define FSL_IMX25_UART1_ADDR	0x43F90000
+#define FSL_IMX25_UART1_SIZE	0x4000
+#define FSL_IMX25_UART2_ADDR	0x43F94000
+#define FSL_IMX25_UART2_SIZE	0x4000
+#define FSL_IMX25_I2C2_ADDR	0x43F98000
+#define FSL_IMX25_I2C2_SIZE	0x4000
+#define FSL_IMX25_UART4_ADDR	0x50008000
+#define FSL_IMX25_UART4_SIZE	0x4000
+#define FSL_IMX25_UART3_ADDR	0x5000C000
+#define FSL_IMX25_UART3_SIZE	0x4000
+#define FSL_IMX25_UART5_ADDR	0x5002C000
+#define FSL_IMX25_UART5_SIZE	0x4000
+#define FSL_IMX25_FEC_ADDR	0x50038000
+#define FSL_IMX25_FEC_SIZE	0x4000
+#define FSL_IMX25_CCM_ADDR	0x53F80000
+#define FSL_IMX25_CCM_SIZE	0x4000
+#define FSL_IMX25_GPT4_ADDR	0x53F84000
+#define FSL_IMX25_GPT4_SIZE	0x4000
+#define FSL_IMX25_GPT3_ADDR	0x53F88000
+#define FSL_IMX25_GPT3_SIZE	0x4000
+#define FSL_IMX25_GPT2_ADDR	0x53F8C000
+#define FSL_IMX25_GPT2_SIZE	0x4000
+#define FSL_IMX25_GPT1_ADDR	0x53F90000
+#define FSL_IMX25_GPT1_SIZE	0x4000
+#define FSL_IMX25_EPIT1_ADDR	0x53F94000
+#define FSL_IMX25_EPIT1_SIZE	0x4000
+#define FSL_IMX25_EPIT2_ADDR	0x53F98000
+#define FSL_IMX25_EPIT2_SIZE	0x4000
+#define FSL_IMX25_AVIC_ADDR	0x68000000
+#define FSL_IMX25_AVIC_SIZE	0x4000
+#define FSL_IMX25_IRAM_ADDR	0x78000000
+#define FSL_IMX25_IRAM_SIZE	0x20000
+#define FSL_IMX25_IRAM_ALIAS_ADDR	0x78020000
+#define FSL_IMX25_IRAM_ALIAS_SIZE	0x7FE0000
+#define FSL_IMX25_SDRAM0_ADDR	0x80000000
+#define FSL_IMX25_SDRAM0_SIZE	0x10000000
+#define FSL_IMX25_SDRAM1_ADDR	0x90000000
+#define FSL_IMX25_SDRAM1_SIZE	0x10000000
+
+#define FSL_IMX25_UART1_IRQ	45
+#define FSL_IMX25_UART2_IRQ	32
+#define FSL_IMX25_UART3_IRQ	18
+#define FSL_IMX25_UART4_IRQ	5
+#define FSL_IMX25_UART5_IRQ	40
+#define FSL_IMX25_GPT1_IRQ	54
+#define FSL_IMX25_GPT2_IRQ	53
+#define FSL_IMX25_GPT3_IRQ	29
+#define FSL_IMX25_GPT4_IRQ	1
+#define FSL_IMX25_EPIT1_IRQ	28
+#define FSL_IMX25_EPIT2_IRQ	27
+#define FSL_IMX25_FEC_IRQ	57
+#define FSL_IMX25_I2C1_IRQ	3
+#define FSL_IMX25_I2C2_IRQ	4
+#define FSL_IMX25_I2C3_IRQ	10
+
+#endif // FSL_IMX25_H