Module Name: src
Committed By: jmcneill
Date: Sat Oct 26 15:58:15 UTC 2019
Modified Files:
src/sys/arch/arm/ti: ti_platform.c
Log Message:
Fix am33xx_platform_early_putchar for pre-MMU output
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ti/ti_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/ti/ti_platform.c
diff -u src/sys/arch/arm/ti/ti_platform.c:1.6 src/sys/arch/arm/ti/ti_platform.c:1.7
--- src/sys/arch/arm/ti/ti_platform.c:1.6 Tue Oct 30 16:41:52 2018
+++ src/sys/arch/arm/ti/ti_platform.c Sat Oct 26 15:58:15 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: ti_platform.c,v 1.6 2018/10/30 16:41:52 skrll Exp $ */
+/* $NetBSD: ti_platform.c,v 1.7 2019/10/26 15:58:15 jmcneill Exp $ */
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.6 2018/10/30 16:41:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.7 2019/10/26 15:58:15 jmcneill Exp $");
#include <sys/param.h>
@@ -25,7 +25,9 @@ am33xx_platform_early_putchar(char c)
{
#ifdef CONSADDR
#define CONSADDR_VA ((CONSADDR - 0x44c00000) + 0xe4c00000)
- volatile uint32_t *uartaddr = (volatile uint32_t *)CONSADDR_VA;
+ volatile uint32_t *uartaddr = cpu_earlydevice_va_p() ?
+ (volatile uint32_t *)CONSADDR_VA :
+ (volatile uint32_t *)CONSADDR;
while ((le32toh(uartaddr[com_lsr]) & LSR_TXRDY) == 0)
;
