|
@@ -159,6 +159,7 @@ static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp)
|
|
DeviceState *armv7m;
|
|
DeviceState *armv7m;
|
|
Error *err = NULL;
|
|
Error *err = NULL;
|
|
int i;
|
|
int i;
|
|
|
|
+ g_autofree char *sram_name = NULL;
|
|
|
|
|
|
if (!clock_has_source(s->sysclk)) {
|
|
if (!clock_has_source(s->sysclk)) {
|
|
error_setg(errp, "sysclk clock must be wired up by the board code");
|
|
error_setg(errp, "sysclk clock must be wired up by the board code");
|
|
@@ -183,7 +184,9 @@ static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp)
|
|
sysbus_realize(SYS_BUS_DEVICE(&s->armv7m), &error_abort);
|
|
sysbus_realize(SYS_BUS_DEVICE(&s->armv7m), &error_abort);
|
|
|
|
|
|
/* Internal SRAM */
|
|
/* Internal SRAM */
|
|
- memory_region_init_ram(&s->sram, NULL, "aspeed.sram", sc->sram_size, &err);
|
|
|
|
|
|
+ sram_name = g_strdup_printf("aspeed.sram.%d",
|
|
|
|
+ CPU(s->armv7m.cpu)->cpu_index);
|
|
|
|
+ memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, &err);
|
|
if (err != NULL) {
|
|
if (err != NULL) {
|
|
error_propagate(errp, err);
|
|
error_propagate(errp, err);
|
|
return;
|
|
return;
|