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/omap.h | |
| parent | 62dd89dea25b08796fcb83beeac3aea5f5a89c95 (diff) | |
| download | qemu-6a8aabd3c132188ee8e0e82ef4aba09f782cbe96.zip qemu-6a8aabd3c132188ee8e0e82ef4aba09f782cbe96.tar.gz qemu-6a8aabd3c132188ee8e0e82ef4aba09f782cbe96.tar.bz2 | |
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/omap.h')
| -rw-r--r-- | hw/omap.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -664,10 +664,12 @@ void omap_synctimer_reset(struct omap_synctimer_s *s); struct omap_uart_s; struct omap_uart_s *omap_uart_init(target_phys_addr_t base, qemu_irq irq, omap_clk fclk, omap_clk iclk, - qemu_irq txdma, qemu_irq rxdma, CharDriverState *chr); + qemu_irq txdma, qemu_irq rxdma, + const char *label, CharDriverState *chr); struct omap_uart_s *omap2_uart_init(struct omap_target_agent_s *ta, qemu_irq irq, omap_clk fclk, omap_clk iclk, - qemu_irq txdma, qemu_irq rxdma, CharDriverState *chr); + qemu_irq txdma, qemu_irq rxdma, + const char *label, CharDriverState *chr); void omap_uart_reset(struct omap_uart_s *s); void omap_uart_attach(struct omap_uart_s *s, CharDriverState *chr); |