diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-08-24 18:31:41 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-09-01 11:54:24 -0300 |
| commit | 701e3c78ce45fa630ffc6826c4b9a4218954bc7f (patch) | |
| tree | ad784aac54f3c466196796d98d2618510b6aa336 /hw/arm | |
| parent | 66b7977518d1b5de342fa080c8361786a1d6d7e2 (diff) | |
arm: replace cpu_arm_init() with cpu_generic_init()
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-19-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/musicpal.c | 2 | ||||
| -rw-r--r-- | hw/arm/omap1.c | 2 | ||||
| -rw-r--r-- | hw/arm/omap2.c | 2 | ||||
| -rw-r--r-- | hw/arm/pxa2xx.c | 4 | ||||
| -rw-r--r-- | hw/arm/strongarm.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 7e8ab3184c..a8b3d463fc 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1593,7 +1593,7 @@ static void musicpal_init(MachineState *machine) if (!cpu_model) { cpu_model = "arm926"; } - cpu = cpu_arm_init(cpu_model); + cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model)); if (!cpu) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 3d15ff6779..400ba30c94 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -3863,7 +3863,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, /* Core */ s->mpu_model = omap310; - s->cpu = cpu_arm_init(core); + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core)); if (s->cpu == NULL) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index bbf0b7e188..ece25ae744 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -2261,7 +2261,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, /* Core */ s->mpu_model = omap2420; - s->cpu = cpu_arm_init(core ?: "arm1136-r2"); + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core ?: "arm1136-r2")); if (s->cpu == NULL) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 194b0bc808..b0ac3cfd64 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -2066,7 +2066,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, if (!revision) revision = "pxa270"; - s->cpu = cpu_arm_init(revision); + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, revision)); if (s->cpu == NULL) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); @@ -2196,7 +2196,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) s = g_new0(PXA2xxState, 1); - s->cpu = cpu_arm_init("pxa255"); + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, "pxa255")); if (s->cpu == NULL) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 6a45dcc009..884242b2dc 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -1597,7 +1597,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, exit(1); } - s->cpu = cpu_arm_init(rev); + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, rev)); if (!s->cpu) { error_report("Unable to find CPU definition"); |