|
@@ -125,7 +125,7 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
|
|
|
Object *obj;
|
|
|
MemoryRegion *ram;
|
|
|
Error *err = NULL;
|
|
|
- uint32_t ram_size, vcram_size;
|
|
|
+ uint64_t ram_size, vcram_size;
|
|
|
int n;
|
|
|
|
|
|
obj = object_property_get_link(OBJECT(dev), "ram", &err);
|
|
@@ -207,15 +207,14 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
|
|
|
INTERRUPT_ARM_MAILBOX));
|
|
|
|
|
|
/* Framebuffer */
|
|
|
- vcram_size = (uint32_t)object_property_get_int(OBJECT(s), "vcram-size",
|
|
|
- &err);
|
|
|
+ vcram_size = object_property_get_uint(OBJECT(s), "vcram-size", &err);
|
|
|
if (err) {
|
|
|
error_propagate(errp, err);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- object_property_set_int(OBJECT(&s->fb), ram_size - vcram_size,
|
|
|
- "vcram-base", &err);
|
|
|
+ object_property_set_uint(OBJECT(&s->fb), ram_size - vcram_size,
|
|
|
+ "vcram-base", &err);
|
|
|
if (err) {
|
|
|
error_propagate(errp, err);
|
|
|
return;
|