diff options
| -rw-r--r-- | src/mainboard/emulation/qemu-armv7/mainboard.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c index c1fcc6ad59..39c2361eea 100644 --- a/src/mainboard/emulation/qemu-armv7/mainboard.c +++ b/src/mainboard/emulation/qemu-armv7/mainboard.c @@ -21,25 +21,26 @@ #include <halt.h> #include "mainboard.h" #include <edid.h> +#include <arch/io.h> static void init_gfx(void) { - volatile uint32_t *pl111; + uint32_t *pl111; struct edid edid; /* width is at most 4096 */ /* height is at most 1024 */ int width = 800, height = 600; uint32_t framebuffer = 0x4c000000; pl111 = (uint32_t *) 0x10020000; - pl111[0] = (width / 4) - 4; - pl111[1] = height - 1; + write32(pl111, (width / 4) - 4); + write32(pl111 + 1, height - 1); /* registers 2, 3 and 5 are ignored by qemu. Set them correctly if we ever go for real hw. */ /* framebuffer adress offset. Has to be in vram. */ - pl111[4] = framebuffer; - pl111[7] = 0; - pl111[10] = 0xff; - pl111[6] = (5 << 1) | 0x801; + write32(pl111 + 4, framebuffer); + write32(pl111 + 7, 0); + write32(pl111 + 10, 0xff); + write32(pl111 + 6, (5 << 1) | 0x801); edid.framebuffer_bits_per_pixel = 32; edid.bytes_per_line = width * 4; |