Module Name: src
Committed By: aymeric
Date: Fri Nov 2 18:11:24 UTC 2018
Modified Files:
src/sys/arch/arm/altera: cycv_platform.c
src/sys/arch/evbarm/conf: NANOSOC
Log Message:
Make early console work.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/altera/cycv_platform.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/NANOSOC
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/altera/cycv_platform.c
diff -u src/sys/arch/arm/altera/cycv_platform.c:1.7 src/sys/arch/arm/altera/cycv_platform.c:1.8
--- src/sys/arch/arm/altera/cycv_platform.c:1.7 Fri Nov 2 18:09:17 2018
+++ src/sys/arch/arm/altera/cycv_platform.c Fri Nov 2 18:11:24 2018
@@ -1,12 +1,13 @@
-/* $NetBSD: cycv_platform.c,v 1.7 2018/11/02 18:09:17 aymeric Exp $ */
+/* $NetBSD: cycv_platform.c,v 1.8 2018/11/02 18:11:24 aymeric Exp $ */
/* This file is in the public domain. */
#include "arml2cc.h"
+#include "opt_console.h"
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.7 2018/11/02 18:09:17 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.8 2018/11/02 18:11:24 aymeric Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -29,6 +30,7 @@ __KERNEL_RCSID(0, "$NetBSD: cycv_platfor
#include <arm/fdt/arm_fdtvar.h>
#include <dev/fdt/fdtvar.h>
+#include <dev/ic/comreg.h>
void cycv_platform_early_putchar(char);
@@ -36,7 +38,9 @@ void
cycv_platform_early_putchar(char c) {
#ifdef CONSADDR
#define CONSADDR_VA (CONSADDR - CYCV_PERIPHERAL_BASE + CYCV_PERIPHERAL_VBASE)
- 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)
;
Index: src/sys/arch/evbarm/conf/NANOSOC
diff -u src/sys/arch/evbarm/conf/NANOSOC:1.3 src/sys/arch/evbarm/conf/NANOSOC:1.4
--- src/sys/arch/evbarm/conf/NANOSOC:1.3 Thu Oct 18 09:01:53 2018
+++ src/sys/arch/evbarm/conf/NANOSOC Fri Nov 2 18:11:24 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: NANOSOC,v 1.3 2018/10/18 09:01:53 skrll Exp $
+# $NetBSD: NANOSOC,v 1.4 2018/11/02 18:11:24 aymeric Exp $
#
# Altera DE0 Nano SoC
#
@@ -45,7 +45,7 @@ l2cc0 at fdt? pass 2
arml2cc0 at l2cc0
com* at fdt?
-options CONSADDR=0xFFC02000, CONSPEED=115200
+options EARLYCONS=cycv, CONSADDR=0xFFC02000, CONSPEED=115200
awge* at fdt?
#micphy* at mii? phy?
