Merge commit 'origin/master' into juha-devel

[qemu] / hw / beagle.c

diff --git a/hw/beagle.c b/hw/beagle.c
index ddceefd..e9b3a7f 100644 (file)
--- a/hw/beagle.c
+++ b/hw/beagle.c
@@ -55,10 +55,7 @@ static void beagle_init(ram_addr_t ram_size, int vga_ram_size,
         fprintf(stderr, "%s: missing SecureDigital device\n", __FUNCTION__);
         exit(1);
     }
-       s->cpu = omap3530_mpu_init(ram_size, NULL);
-    
-    if (serial_hds[0])
-        omap_uart_attach(s->cpu->uart[2], serial_hds[0]);
+       s->cpu = omap3530_mpu_init(ram_size, NULL, NULL, serial_hds[0]);
 
        s->nand = nand_init(NAND_MFR_MICRON, 0xba); /* MT29F2G16ABC */
        nand_setpins(s->nand, 0, 0, 0, 1, 0); /* no write-protect */