diff options
| author | hyokeun <hyokeun.jeon@samsung.com> | 2016-12-27 17:29:09 +0900 |
|---|---|---|
| committer | hyokeun <hyokeun.jeon@samsung.com> | 2016-12-27 17:29:09 +0900 |
| commit | 2a84d37c88d606fda46a565bcc80e173b4d0a80a (patch) | |
| tree | 8b755bb78271e76e13fb7db38b670dbc443479e7 /hw/arm/fsl-imx31.c | |
| parent | bd54c25035217800f3b1d39f6472d599cd602d5a (diff) | |
| download | qemu-2a84d37c88d606fda46a565bcc80e173b4d0a80a.tar.gz qemu-2a84d37c88d606fda46a565bcc80e173b4d0a80a.tar.bz2 qemu-2a84d37c88d606fda46a565bcc80e173b4d0a80a.zip | |
Imported Upstream version 2.6.1upstream/2.6.1upstream
Diffstat (limited to 'hw/arm/fsl-imx31.c')
| -rw-r--r-- | hw/arm/fsl-imx31.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index fe204ace6..31a3a8791 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -47,7 +47,7 @@ static void fsl_imx31_init(Object *obj) qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default()); } - object_initialize(&s->gpt, sizeof(s->gpt), TYPE_IMX31_GPT); + object_initialize(&s->gpt, sizeof(s->gpt), TYPE_IMX_GPT); qdev_set_parent_bus(DEVICE(&s->gpt), sysbus_get_default()); for (i = 0; i < FSL_IMX31_NUM_EPITS; i++) { @@ -219,8 +219,9 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) } /* On a real system, the first 16k is a `secure boot rom' */ - memory_region_init_rom(&s->secure_rom, NULL, "imx31.secure_rom", - FSL_IMX31_SECURE_ROM_SIZE, &err); + memory_region_init_rom_device(&s->secure_rom, NULL, NULL, NULL, + "imx31.secure_rom", + FSL_IMX31_SECURE_ROM_SIZE, &err); if (err) { error_propagate(errp, err); return; @@ -229,8 +230,8 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) &s->secure_rom); /* There is also a 16k ROM */ - memory_region_init_rom(&s->rom, NULL, "imx31.rom", - FSL_IMX31_ROM_SIZE, &err); + memory_region_init_rom_device(&s->rom, NULL, NULL, NULL, "imx31.rom", + FSL_IMX31_ROM_SIZE, &err); if (err) { error_propagate(errp, err); return; |