diff mbox

[v10,19/21] i.MX: Add the i.MX25 3DS PDK plateform

Message ID 5ef4a41ad817121a54789e6c9fbe92f2989e062b.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:
    * Added a ds1338 I2C device for qtest purpose.

Changes since v2:
    * none
 
Changes since v3:
    * Rework GPL header          
    * use I2C constructor helper.

Changes since v4:
    * use sysbus_create_simple() instead of I2C constructor helper

Changes since v5:
    * Add ds1338 only for qtest mode.
    * small comment fixes.

Changes since v6:
    * Allow for more than 4 serial if suppoted by Qemu.

Changes since v7:
    * Move the SOC part into its own file.

Changes since v8:
    * rework SDRAM memory initialisation

Changes since v9:
    * no change

 hw/arm/Makefile.objs |   2 +-
 hw/arm/imx25_3ds.c   | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 hw/arm/imx25_3ds.c

Comments

Peter Crosthwaite July 6, 2015, 7:43 a.m. UTC | #1 
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:
>     * Added a ds1338 I2C device for qtest purpose.
>
> Changes since v2:
>     * none
>
> Changes since v3:
>     * Rework GPL header
>     * use I2C constructor helper.
>
> Changes since v4:
>     * use sysbus_create_simple() instead of I2C constructor helper
>
> Changes since v5:
>     * Add ds1338 only for qtest mode.
>     * small comment fixes.
>
> Changes since v6:
>     * Allow for more than 4 serial if suppoted by Qemu.
>
> Changes since v7:
>     * Move the SOC part into its own file.
>
> Changes since v8:
>     * rework SDRAM memory initialisation
>
> Changes since v9:
>     * no change
>
>  hw/arm/Makefile.objs |   2 +-
>  hw/arm/imx25_3ds.c   | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 171 insertions(+), 1 deletion(-)
>  create mode 100644 hw/arm/imx25_3ds.c
>
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index b83aaca..dc11c0a 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -13,5 +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_IMX25) += fsl-imx25.o imx25_3ds.o
>  obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
> diff --git a/hw/arm/imx25_3ds.c b/hw/arm/imx25_3ds.c
> new file mode 100644
> index 0000000..fef462a
> --- /dev/null
> +++ b/hw/arm/imx25_3ds.c
> @@ -0,0 +1,170 @@
> +/*
> + * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
> + *
> + * 3Dstack Board System emulation.
> + *

Should it be called the PDK board?

Regards,
Peter

> + * Based on hw/arm/kzm.c
> + *
> + * Copyright (c) 2008 OKL and 2011 NICTA
> + * Written by Hans at OK-Labs
> + * Updated by Peter Chubb.
> + *
> + *  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 "hw/boards.h"
> +#include "qemu/error-report.h"
> +#include "exec/address-spaces.h"
> +#include "sysemu/qtest.h"
> +#include "hw/i2c/i2c.h"
> +
> +/* Memory map for 3D-Stack Emulation Baseboard:
> + * 0x00000000-0x7fffffff See i.MX25 SOC fr support
> + * 0x80000000-0x87ffffff RAM + Alias          EMULATED
> + * 0x90000000-0x9fffffff RAM + Alias          EMULATED
> + * 0xa0000000-0xa7ffffff Flash                IGNORED
> + * 0xa8000000-0xafffffff Flash                IGNORED
> + * 0xb0000000-0xb1ffffff SRAM                 IGNORED
> + * 0xb2000000-0xb3ffffff SRAM                 IGNORED
> + * 0xb4000000-0xb5ffffff CS4                  IGNORED
> + * 0xb6000000-0xb8000fff Reserved             IGNORED
> + * 0xb8001000-0xb8001fff SDRAM CTRL reg       IGNORED
> + * 0xb8002000-0xb8002fff WEIM CTRL reg        IGNORED
> + * 0xb8003000-0xb8003fff M3IF CTRL reg        IGNORED
> + * 0xb8004000-0xb8004fff EMI CTRL reg         IGNORED
> + * 0xb8005000-0xbaffffff Reserved             IGNORED
> + * 0xbb000000-0xbb000fff NAND flash area buf  IGNORED
> + * 0xbb001000-0xbb0011ff NAND flash reserved  IGNORED
> + * 0xbb001200-0xbb001dff Reserved             IGNORED
> + * 0xbb001e00-0xbb001fff NAN flash CTRL reg   IGNORED
> + * 0xbb012000-0xbfffffff Reserved             IGNORED
> + * 0xc0000000-0xffffffff Reserved             IGNORED
> + */
> +
> +typedef struct imx25_3ds {
> +    FslImx25State soc;
> +    MemoryRegion ram[2];
> +    MemoryRegion ram_alias;
> +} imx25_3ds;
> +
> +#define IMX25_3DS_ADDRESS   (FSL_IMX25_SDRAM0_ADDR)
> +
> +static struct arm_boot_info imx25_3ds_binfo;
> +
> +static void imx25_3ds_init(MachineState *machine)
> +{
> +    imx25_3ds *s = g_new0(imx25_3ds, 1);
> +    Error *err = NULL;
> +    unsigned int ram_size;
> +    int i;
> +
> +    object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX25);
> +    object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),
> +                              &error_abort);
> +
> +    object_property_set_bool(OBJECT(&s->soc), true, "realized", &err);
> +    if (err != NULL) {
> +        error_report("%s", error_get_pretty(err));
> +        exit(1);
> +    }
> +
> +    /* We need to initialize our memory */
> +
> +    if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) {
> +       error_report("WARNING: RAM size " RAM_ADDR_FMT " above max supported, "
> +                     "reduced to %x", machine->ram_size,
> +                     FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE);
> +       machine->ram_size = FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE;
> +    }
> +
> +    ram_size = machine->ram_size;
> +    i = 0;
> +
> +    /* create our main memory */
> +    while (ram_size && (i < 2)) {
> +        unsigned int size;
> +        char ram_name[20];
> +        static const struct {
> +            hwaddr addr;
> +            unsigned int size;
> +        } ram[2] = {
> +            { FSL_IMX25_SDRAM0_ADDR, FSL_IMX25_SDRAM0_SIZE },
> +            { FSL_IMX25_SDRAM1_ADDR, FSL_IMX25_SDRAM1_SIZE },
> +        };
> +
> +        if (ram_size > ram[i].size) {
> +            size = ram[i].size;
> +        } else {
> +            size = ram_size;
> +        }
> +
> +        sprintf(ram_name, "imx25.ram%d", i);
> +
> +        ram_size -= size;
> +
> +        memory_region_init_ram(&s->ram[i], NULL, ram_name, size,
> +                               &error_abort);
> +        vmstate_register_ram_global(&s->ram[i]);
> +        memory_region_add_subregion(get_system_memory(), ram[i].addr,
> +                                    &s->ram[i]);
> +        if (size < ram[i].size) {
> +            memory_region_init_alias(&s->ram_alias, NULL, "ram.alias",
> +                                     &s->ram[i], 0, ram[i].size - size);
> +            memory_region_add_subregion(get_system_memory(),
> +                                        ram[i].addr + size, &s->ram_alias);
> +        }
> +
> +        i++;
> +    }
> +
> +    imx25_3ds_binfo.ram_size = machine->ram_size;
> +    imx25_3ds_binfo.kernel_filename = machine->kernel_filename;
> +    imx25_3ds_binfo.kernel_cmdline = machine->kernel_cmdline;
> +    imx25_3ds_binfo.initrd_filename = machine->initrd_filename;
> +    imx25_3ds_binfo.loader_start = IMX25_3DS_ADDRESS;
> +    imx25_3ds_binfo.board_id = 1771,
> +    imx25_3ds_binfo.nb_cpus = 1;
> +
> +    /*
> +     * We test explicitly for qtest here as it is not done (yet?) in
> +     * arm_load_kernel(). Without this the "make check" command would
> +     * fail.
> +     */
> +    if (!qtest_enabled()) {
> +        arm_load_kernel(&s->soc.cpu, &imx25_3ds_binfo);
> +    } else {
> +        /*
> +         * This I2C device doesn't exist on the real board.
> +         * We add it here (only on qtest usage) to be able to do a bit
> +         * of simple qtest. See "make check" for details.
> +         */
> +        i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s->soc.i2c[0]),
> +                                                      "i2c"),
> +                         "ds1338", 0x68);
> +    }
> +}
> +
> +static QEMUMachine imx25_3ds_machine = {
> +    .name = "imx25_3ds",
> +    .desc = "ARM i.MX25 PDK board (ARM926)",
> +    .init = imx25_3ds_init,
> +};
> +
> +static void imx25_3ds_machine_init(void)
> +{
> +    qemu_register_machine(&imx25_3ds_machine);
> +}
> +
> +machine_init(imx25_3ds_machine_init)
> --
> 2.1.4
>
>
Jean-Christophe Dubois July 8, 2015, 5:59 p.m. UTC | #2 
Le 06/07/2015 09:43, Peter Crosthwaite a écrit :
> 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:
>>      * Added a ds1338 I2C device for qtest purpose.
>>
>> Changes since v2:
>>      * none
>>
>> Changes since v3:
>>      * Rework GPL header
>>      * use I2C constructor helper.
>>
>> Changes since v4:
>>      * use sysbus_create_simple() instead of I2C constructor helper
>>
>> Changes since v5:
>>      * Add ds1338 only for qtest mode.
>>      * small comment fixes.
>>
>> Changes since v6:
>>      * Allow for more than 4 serial if suppoted by Qemu.
>>
>> Changes since v7:
>>      * Move the SOC part into its own file.
>>
>> Changes since v8:
>>      * rework SDRAM memory initialisation
>>
>> Changes since v9:
>>      * no change
>>
>>   hw/arm/Makefile.objs |   2 +-
>>   hw/arm/imx25_3ds.c   | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++
>>   2 files changed, 171 insertions(+), 1 deletion(-)
>>   create mode 100644 hw/arm/imx25_3ds.c
>>
>> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
>> index b83aaca..dc11c0a 100644
>> --- a/hw/arm/Makefile.objs
>> +++ b/hw/arm/Makefile.objs
>> @@ -13,5 +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_IMX25) += fsl-imx25.o imx25_3ds.o
>>   obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
>> diff --git a/hw/arm/imx25_3ds.c b/hw/arm/imx25_3ds.c
>> new file mode 100644
>> index 0000000..fef462a
>> --- /dev/null
>> +++ b/hw/arm/imx25_3ds.c
>> @@ -0,0 +1,170 @@
>> +/*
>> + * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
>> + *
>> + * 3Dstack Board System emulation.
>> + *
> Should it be called the PDK board?
OK, I'll rename it ...
>
> Regards,
> Peter
>
>> + * Based on hw/arm/kzm.c
>> + *
>> + * Copyright (c) 2008 OKL and 2011 NICTA
>> + * Written by Hans at OK-Labs
>> + * Updated by Peter Chubb.
>> + *
>> + *  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 "hw/boards.h"
>> +#include "qemu/error-report.h"
>> +#include "exec/address-spaces.h"
>> +#include "sysemu/qtest.h"
>> +#include "hw/i2c/i2c.h"
>> +
>> +/* Memory map for 3D-Stack Emulation Baseboard:
>> + * 0x00000000-0x7fffffff See i.MX25 SOC fr support
>> + * 0x80000000-0x87ffffff RAM + Alias          EMULATED
>> + * 0x90000000-0x9fffffff RAM + Alias          EMULATED
>> + * 0xa0000000-0xa7ffffff Flash                IGNORED
>> + * 0xa8000000-0xafffffff Flash                IGNORED
>> + * 0xb0000000-0xb1ffffff SRAM                 IGNORED
>> + * 0xb2000000-0xb3ffffff SRAM                 IGNORED
>> + * 0xb4000000-0xb5ffffff CS4                  IGNORED
>> + * 0xb6000000-0xb8000fff Reserved             IGNORED
>> + * 0xb8001000-0xb8001fff SDRAM CTRL reg       IGNORED
>> + * 0xb8002000-0xb8002fff WEIM CTRL reg        IGNORED
>> + * 0xb8003000-0xb8003fff M3IF CTRL reg        IGNORED
>> + * 0xb8004000-0xb8004fff EMI CTRL reg         IGNORED
>> + * 0xb8005000-0xbaffffff Reserved             IGNORED
>> + * 0xbb000000-0xbb000fff NAND flash area buf  IGNORED
>> + * 0xbb001000-0xbb0011ff NAND flash reserved  IGNORED
>> + * 0xbb001200-0xbb001dff Reserved             IGNORED
>> + * 0xbb001e00-0xbb001fff NAN flash CTRL reg   IGNORED
>> + * 0xbb012000-0xbfffffff Reserved             IGNORED
>> + * 0xc0000000-0xffffffff Reserved             IGNORED
>> + */
>> +
>> +typedef struct imx25_3ds {
>> +    FslImx25State soc;
>> +    MemoryRegion ram[2];
>> +    MemoryRegion ram_alias;
>> +} imx25_3ds;
>> +
>> +#define IMX25_3DS_ADDRESS   (FSL_IMX25_SDRAM0_ADDR)
>> +
>> +static struct arm_boot_info imx25_3ds_binfo;
>> +
>> +static void imx25_3ds_init(MachineState *machine)
>> +{
>> +    imx25_3ds *s = g_new0(imx25_3ds, 1);
>> +    Error *err = NULL;
>> +    unsigned int ram_size;
>> +    int i;
>> +
>> +    object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX25);
>> +    object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),
>> +                              &error_abort);
>> +
>> +    object_property_set_bool(OBJECT(&s->soc), true, "realized", &err);
>> +    if (err != NULL) {
>> +        error_report("%s", error_get_pretty(err));
>> +        exit(1);
>> +    }
>> +
>> +    /* We need to initialize our memory */
>> +
>> +    if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) {
>> +       error_report("WARNING: RAM size " RAM_ADDR_FMT " above max supported, "
>> +                     "reduced to %x", machine->ram_size,
>> +                     FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE);
>> +       machine->ram_size = FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE;
>> +    }
>> +
>> +    ram_size = machine->ram_size;
>> +    i = 0;
>> +
>> +    /* create our main memory */
>> +    while (ram_size && (i < 2)) {
>> +        unsigned int size;
>> +        char ram_name[20];
>> +        static const struct {
>> +            hwaddr addr;
>> +            unsigned int size;
>> +        } ram[2] = {
>> +            { FSL_IMX25_SDRAM0_ADDR, FSL_IMX25_SDRAM0_SIZE },
>> +            { FSL_IMX25_SDRAM1_ADDR, FSL_IMX25_SDRAM1_SIZE },
>> +        };
>> +
>> +        if (ram_size > ram[i].size) {
>> +            size = ram[i].size;
>> +        } else {
>> +            size = ram_size;
>> +        }
>> +
>> +        sprintf(ram_name, "imx25.ram%d", i);
>> +
>> +        ram_size -= size;
>> +
>> +        memory_region_init_ram(&s->ram[i], NULL, ram_name, size,
>> +                               &error_abort);
>> +        vmstate_register_ram_global(&s->ram[i]);
>> +        memory_region_add_subregion(get_system_memory(), ram[i].addr,
>> +                                    &s->ram[i]);
>> +        if (size < ram[i].size) {
>> +            memory_region_init_alias(&s->ram_alias, NULL, "ram.alias",
>> +                                     &s->ram[i], 0, ram[i].size - size);
>> +            memory_region_add_subregion(get_system_memory(),
>> +                                        ram[i].addr + size, &s->ram_alias);
>> +        }
>> +
>> +        i++;
>> +    }
>> +
>> +    imx25_3ds_binfo.ram_size = machine->ram_size;
>> +    imx25_3ds_binfo.kernel_filename = machine->kernel_filename;
>> +    imx25_3ds_binfo.kernel_cmdline = machine->kernel_cmdline;
>> +    imx25_3ds_binfo.initrd_filename = machine->initrd_filename;
>> +    imx25_3ds_binfo.loader_start = IMX25_3DS_ADDRESS;
>> +    imx25_3ds_binfo.board_id = 1771,
>> +    imx25_3ds_binfo.nb_cpus = 1;
>> +
>> +    /*
>> +     * We test explicitly for qtest here as it is not done (yet?) in
>> +     * arm_load_kernel(). Without this the "make check" command would
>> +     * fail.
>> +     */
>> +    if (!qtest_enabled()) {
>> +        arm_load_kernel(&s->soc.cpu, &imx25_3ds_binfo);
>> +    } else {
>> +        /*
>> +         * This I2C device doesn't exist on the real board.
>> +         * We add it here (only on qtest usage) to be able to do a bit
>> +         * of simple qtest. See "make check" for details.
>> +         */
>> +        i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s->soc.i2c[0]),
>> +                                                      "i2c"),
>> +                         "ds1338", 0x68);
>> +    }
>> +}
>> +
>> +static QEMUMachine imx25_3ds_machine = {
>> +    .name = "imx25_3ds",
>> +    .desc = "ARM i.MX25 PDK board (ARM926)",
>> +    .init = imx25_3ds_init,
>> +};
>> +
>> +static void imx25_3ds_machine_init(void)
>> +{
>> +    qemu_register_machine(&imx25_3ds_machine);
>> +}
>> +
>> +machine_init(imx25_3ds_machine_init)
>> --
>> 2.1.4
>>
>>
diff mbox

Patch

diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index b83aaca..dc11c0a 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -13,5 +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_IMX25) += fsl-imx25.o imx25_3ds.o
 obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
diff --git a/hw/arm/imx25_3ds.c b/hw/arm/imx25_3ds.c
new file mode 100644
index 0000000..fef462a
--- /dev/null
+++ b/hw/arm/imx25_3ds.c
@@ -0,0 +1,170 @@ 
+/*
+ * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
+ *
+ * 3Dstack Board System emulation.
+ *
+ * Based on hw/arm/kzm.c
+ *
+ * Copyright (c) 2008 OKL and 2011 NICTA
+ * Written by Hans at OK-Labs
+ * Updated by Peter Chubb.
+ *
+ *  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 "hw/boards.h"
+#include "qemu/error-report.h"
+#include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
+#include "hw/i2c/i2c.h"
+
+/* Memory map for 3D-Stack Emulation Baseboard:
+ * 0x00000000-0x7fffffff See i.MX25 SOC fr support
+ * 0x80000000-0x87ffffff RAM + Alias          EMULATED
+ * 0x90000000-0x9fffffff RAM + Alias          EMULATED
+ * 0xa0000000-0xa7ffffff Flash                IGNORED
+ * 0xa8000000-0xafffffff Flash                IGNORED
+ * 0xb0000000-0xb1ffffff SRAM                 IGNORED
+ * 0xb2000000-0xb3ffffff SRAM                 IGNORED
+ * 0xb4000000-0xb5ffffff CS4                  IGNORED
+ * 0xb6000000-0xb8000fff Reserved             IGNORED
+ * 0xb8001000-0xb8001fff SDRAM CTRL reg       IGNORED
+ * 0xb8002000-0xb8002fff WEIM CTRL reg        IGNORED
+ * 0xb8003000-0xb8003fff M3IF CTRL reg        IGNORED
+ * 0xb8004000-0xb8004fff EMI CTRL reg         IGNORED
+ * 0xb8005000-0xbaffffff Reserved             IGNORED
+ * 0xbb000000-0xbb000fff NAND flash area buf  IGNORED
+ * 0xbb001000-0xbb0011ff NAND flash reserved  IGNORED
+ * 0xbb001200-0xbb001dff Reserved             IGNORED
+ * 0xbb001e00-0xbb001fff NAN flash CTRL reg   IGNORED
+ * 0xbb012000-0xbfffffff Reserved             IGNORED
+ * 0xc0000000-0xffffffff Reserved             IGNORED
+ */
+
+typedef struct imx25_3ds {
+    FslImx25State soc;
+    MemoryRegion ram[2];
+    MemoryRegion ram_alias;
+} imx25_3ds;
+
+#define IMX25_3DS_ADDRESS   (FSL_IMX25_SDRAM0_ADDR)
+
+static struct arm_boot_info imx25_3ds_binfo;
+
+static void imx25_3ds_init(MachineState *machine)
+{
+    imx25_3ds *s = g_new0(imx25_3ds, 1);
+    Error *err = NULL;
+    unsigned int ram_size;
+    int i;
+
+    object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX25);
+    object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),
+                              &error_abort);
+
+    object_property_set_bool(OBJECT(&s->soc), true, "realized", &err);
+    if (err != NULL) {
+        error_report("%s", error_get_pretty(err));
+        exit(1);
+    }
+
+    /* We need to initialize our memory */
+
+    if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) {
+	error_report("WARNING: RAM size " RAM_ADDR_FMT " above max supported, "
+                     "reduced to %x", machine->ram_size,
+                     FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE);
+	machine->ram_size = FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE;
+    }
+
+    ram_size = machine->ram_size;
+    i = 0;
+
+    /* create our main memory */
+    while (ram_size && (i < 2)) {
+        unsigned int size;
+        char ram_name[20];
+        static const struct {
+            hwaddr addr;
+            unsigned int size;
+        } ram[2] = {
+            { FSL_IMX25_SDRAM0_ADDR, FSL_IMX25_SDRAM0_SIZE },
+            { FSL_IMX25_SDRAM1_ADDR, FSL_IMX25_SDRAM1_SIZE },
+        };
+
+        if (ram_size > ram[i].size) {
+            size = ram[i].size;
+        } else {
+            size = ram_size;
+        }
+
+        sprintf(ram_name, "imx25.ram%d", i);
+
+        ram_size -= size;
+
+        memory_region_init_ram(&s->ram[i], NULL, ram_name, size,
+                               &error_abort);
+        vmstate_register_ram_global(&s->ram[i]);
+        memory_region_add_subregion(get_system_memory(), ram[i].addr,
+                                    &s->ram[i]);
+        if (size < ram[i].size) {
+            memory_region_init_alias(&s->ram_alias, NULL, "ram.alias",
+                                     &s->ram[i], 0, ram[i].size - size);
+            memory_region_add_subregion(get_system_memory(),
+                                        ram[i].addr + size, &s->ram_alias);
+        }
+
+        i++;
+    }
+
+    imx25_3ds_binfo.ram_size = machine->ram_size;
+    imx25_3ds_binfo.kernel_filename = machine->kernel_filename;
+    imx25_3ds_binfo.kernel_cmdline = machine->kernel_cmdline;
+    imx25_3ds_binfo.initrd_filename = machine->initrd_filename;
+    imx25_3ds_binfo.loader_start = IMX25_3DS_ADDRESS;
+    imx25_3ds_binfo.board_id = 1771,
+    imx25_3ds_binfo.nb_cpus = 1;
+
+    /*
+     * We test explicitly for qtest here as it is not done (yet?) in
+     * arm_load_kernel(). Without this the "make check" command would
+     * fail.
+     */
+    if (!qtest_enabled()) {
+        arm_load_kernel(&s->soc.cpu, &imx25_3ds_binfo);
+    } else {
+        /*
+         * This I2C device doesn't exist on the real board.
+         * We add it here (only on qtest usage) to be able to do a bit
+         * of simple qtest. See "make check" for details.
+         */
+        i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s->soc.i2c[0]),
+                                                      "i2c"),
+                         "ds1338", 0x68);
+    }
+}
+
+static QEMUMachine imx25_3ds_machine = {
+    .name = "imx25_3ds",
+    .desc = "ARM i.MX25 PDK board (ARM926)",
+    .init = imx25_3ds_init,
+};
+
+static void imx25_3ds_machine_init(void)
+{
+    qemu_register_machine(&imx25_3ds_machine);
+}
+
+machine_init(imx25_3ds_machine_init)