diff options
| author | Peter Delevoryas <pdel@fb.com> | 2022-05-25 10:31:33 +0200 |
|---|---|---|
| committer | Cédric Le Goater <clg@kaod.org> | 2022-05-25 10:31:33 +0200 |
| commit | 94d10f42109a5ba23e26012722b16f0f479990cb (patch) | |
| tree | 9ec5a8c92f3f8e1fddbd048b503a3cc10e622ea2 /hw | |
| parent | c5e1bdb9e243ad5563196175415f42e459040367 (diff) | |
| download | qemu-94d10f42109a5ba23e26012722b16f0f479990cb.zip qemu-94d10f42109a5ba23e26012722b16f0f479990cb.tar.gz qemu-94d10f42109a5ba23e26012722b16f0f479990cb.tar.bz2 | |
hw: aspeed: Ensure AST1030 respects uart-default
The AST1030 machine initialization was not respecting the Aspeed SoC
property "uart-default", which specifies which UART should be connected to
the first serial device, it was just always connecting UART5. This doesn't
change any behavior, because the default value for "uart-default" is UART5,
but it makes it possible to override this in new machine definitions using
the AST1030.
Signed-off-by: Peter Delevoryas <pdel@fb.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220516062328.298336-4-pdel@fb.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/aspeed_ast10x0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c index bb8177e..faafb80 100644 --- a/hw/arm/aspeed_ast10x0.c +++ b/hw/arm/aspeed_ast10x0.c @@ -215,9 +215,9 @@ static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp) qdev_get_gpio_in(DEVICE(&s->armv7m), sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_4)); - /* UART5 - attach an 8250 to the IO space as our UART */ - serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2, - aspeed_soc_get_irq(s, ASPEED_DEV_UART5), + /* UART - attach an 8250 to the IO space as our UART */ + serial_mm_init(get_system_memory(), sc->memmap[s->uart_default], 2, + aspeed_soc_get_irq(s, s->uart_default), 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); /* Timer */ |