From bec6e07afde3bffb52f1a9d26a90ccbdfff13690 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Sun, 1 Dec 2019 21:35:24 +0100 Subject: hw/sparc64/niagara: Map the UART device unconditionally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The UART is present on the machine regardless there is a character device connected to it. Map it unconditionally. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Artyom Tarasenko Message-Id: <20200608172144.20461-4-f4bug@amsat.org> --- hw/sparc64/niagara.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'hw/sparc64/niagara.c') diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index ab5ef8c5b3..148a26890e 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -152,10 +152,8 @@ static void niagara_init(MachineState *machine) exit(1); } } - if (serial_hd(0)) { - serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200, - serial_hd(0), DEVICE_BIG_ENDIAN); - } + serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, + 115200, serial_hd(0), DEVICE_BIG_ENDIAN); create_unimplemented_device("sun4v-iob", NIAGARA_IOBBASE, NIAGARA_IOBSIZE); sun4v_rtc_init(NIAGARA_RTC_BASE); } -- cgit 1.4.1 From aceeb71306b41ab0ad2eb82d15a2beb6d8ea0e49 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Mon, 8 Jun 2020 19:14:37 +0200 Subject: hw/sparc64/niagara: Remove duplicated NIAGARA_UART_BASE definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NIAGARA_UART_BASE is already defined few lines earlier. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Artyom Tarasenko Message-Id: <20200608172144.20461-3-f4bug@amsat.org> --- hw/sparc64/niagara.c | 1 - 1 file changed, 1 deletion(-) (limited to 'hw/sparc64/niagara.c') diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 148a26890e..a87d55f6bb 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -68,7 +68,6 @@ typedef struct NiagaraBoardState { #define NIAGARA_VDISK_BASE 0x1f40000000ULL #define NIAGARA_RTC_BASE 0xfff0c1fff8ULL -#define NIAGARA_UART_BASE 0x1f10000000ULL /* Firmware layout * -- cgit 1.4.1