Module Name: src
Committed By: rin
Date: Mon Nov 23 06:24:35 UTC 2020
Modified Files:
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/evbarm/conf: RPI
Log Message:
Support EARLYCONS and VERBOSE_INIT_ARM for Raspberry Pi Zero W, for
which mini UART should be used instead of PL011 UART.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/evbarm/conf/RPI
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/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.42 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.43
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.42 Mon Nov 23 06:21:07 2020
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Mon Nov 23 06:24:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.42 2020/11/23 06:21:07 rin Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.43 2020/11/23 06:24:35 rin Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.42 2020/11/23 06:21:07 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.43 2020/11/23 06:24:35 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -112,6 +112,7 @@ __KERNEL_RCSID(0, "$NetBSD: bcm283x_plat
#define RPI_CPU_MAX 4
void bcm2835_platform_early_putchar(char c);
+void bcm2835_aux_platform_early_putchar(char c);
void bcm2836_platform_early_putchar(char c);
void bcm2837_platform_early_putchar(char c);
void bcm2711_platform_early_putchar(char c);
@@ -1368,6 +1369,15 @@ bcm2835_platform_early_putchar(char c)
}
void __noasan
+bcm2835_aux_platform_early_putchar(char c)
+{
+ paddr_t pa = BCM2835_PERIPHERALS_BUS_TO_PHYS(BCM2835_AUX_UART_BASE);
+ vaddr_t va = BCM2835_IOPHYSTOVIRT(pa);
+
+ bcm283x_aux_platform_early_putchar(va, pa, c);
+}
+
+void __noasan
bcm2836_platform_early_putchar(char c)
{
paddr_t pa = BCM2836_PERIPHERALS_BUS_TO_PHYS(BCM2835_UART0_BASE);
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.93 src/sys/arch/evbarm/conf/RPI:1.94
--- src/sys/arch/evbarm/conf/RPI:1.93 Fri Oct 30 11:02:50 2020
+++ src/sys/arch/evbarm/conf/RPI Mon Nov 23 06:24:35 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.93 2020/10/30 11:02:50 rin Exp $
+# $NetBSD: RPI,v 1.94 2020/11/23 06:24:35 rin Exp $
#
# RPi -- Raspberry Pi
#
@@ -19,7 +19,8 @@ makeoptions CPUFLAGS="-march=armv6z -mt
# Development and Debugging options
#options KGDB,KGDB_PLCOMUNIT=0,KGDB_DEVRATE=115200,KGDB_CONMODE=0xB00
#options VERBOSE_INIT_ARM
-#options EARLYCONS=bcm2835,CONSADDR=0x20201000
+#options EARLYCONS=bcm2835,CONSADDR=0x20201000 # RPI1, RPI0
+#options EARLYCONS=bcm2835_aux,CONSADDR=0x20215040 # RPI0W
makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPY_SYMTAB=1
options PLCONSOLE
