diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2010-08-08 14:09:26 +0200 |
|---|---|---|
| committer | Andrzej Zaborowski <balrog@zabor.org> | 2010-09-10 01:55:53 +0200 |
| commit | 6a8aabd3c132188ee8e0e82ef4aba09f782cbe96 (patch) | |
| tree | b1867d887a224a7cc75c00a7c253b11ca3da0ee0 /hw/omap2.c | |
| parent | 62dd89dea25b08796fcb83beeac3aea5f5a89c95 (diff) | |
hw/omap: Fix default setup for OMAP UART devices
Character devices created by qemu_chr_open don't
allow duplicate device names, so naming all
UART devices "null" no longer works.
Running "qemu-system-arm -M n800" (and some other machines)
results in this error message:
qemu-system-arm: Duplicate ID 'null' for chardev
Can't create serial device, empty char device
This is fixed by setting a default label "uart1",
"uart2" or "uart3".
Cc: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Diffstat (limited to 'hw/omap2.c')
| -rw-r--r-- | hw/omap2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/omap2.c b/hw/omap2.c index 179075e996..e35a56e043 100644 --- a/hw/omap2.c +++ b/hw/omap2.c @@ -2291,13 +2291,16 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size, omap_findclk(s, "uart1_fclk"), omap_findclk(s, "uart1_iclk"), s->drq[OMAP24XX_DMA_UART1_TX], - s->drq[OMAP24XX_DMA_UART1_RX], serial_hds[0]); + s->drq[OMAP24XX_DMA_UART1_RX], + "uart1", + serial_hds[0]); s->uart[1] = omap2_uart_init(omap_l4ta(s->l4, 20), s->irq[0][OMAP_INT_24XX_UART2_IRQ], omap_findclk(s, "uart2_fclk"), omap_findclk(s, "uart2_iclk"), s->drq[OMAP24XX_DMA_UART2_TX], s->drq[OMAP24XX_DMA_UART2_RX], + "uart2", serial_hds[0] ? serial_hds[1] : NULL); s->uart[2] = omap2_uart_init(omap_l4ta(s->l4, 21), s->irq[0][OMAP_INT_24XX_UART3_IRQ], @@ -2305,6 +2308,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size, omap_findclk(s, "uart3_iclk"), s->drq[OMAP24XX_DMA_UART3_TX], s->drq[OMAP24XX_DMA_UART3_RX], + "uart3", serial_hds[0] && serial_hds[1] ? serial_hds[2] : NULL); s->gptimer[0] = omap_gp_timer_init(omap_l4ta(s->l4, 7), |