Module Name: src
Committed By: jmcneill
Date: Tue May 30 22:55:27 UTC 2017
Modified Files:
src/sys/arch/arm/fdt: files.fdt
src/sys/arch/arm/nvidia: files.tegra tegra_platform.c tegra_reg.h
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/arch/evbarm/tegra: tegra_start.S
Log Message:
Fix VERBOSE_INIT_ARM build with TEGRA kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/fdt/files.fdt
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/nvidia/files.tegra
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra_reg.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/tegra/tegra_start.S
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/fdt/files.fdt
diff -u src/sys/arch/arm/fdt/files.fdt:1.3 src/sys/arch/arm/fdt/files.fdt:1.4
--- src/sys/arch/arm/fdt/files.fdt:1.3 Mon May 29 23:21:12 2017
+++ src/sys/arch/arm/fdt/files.fdt Tue May 30 22:55:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.3 2017/05/29 23:21:12 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.4 2017/05/30 22:55:26 jmcneill Exp $
device armfdt { }: bus_space_generic, fdtbus
attach armfdt at root with arm_fdt
@@ -14,3 +14,6 @@ file arch/arm/fdt/gtmr_fdt.c gtmr_fdt
device gic: mpcorebus
attach gic at fdt with gic_fdt
file arch/arm/fdt/gic_fdt.c gic_fdt
+
+# Console parameters
+defparam opt_fdt_arm.h CONSADDR
Index: src/sys/arch/arm/nvidia/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.38 src/sys/arch/arm/nvidia/files.tegra:1.39
--- src/sys/arch/arm/nvidia/files.tegra:1.38 Sun May 28 23:39:30 2017
+++ src/sys/arch/arm/nvidia/files.tegra Tue May 30 22:55:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.38 2017/05/28 23:39:30 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.39 2017/05/30 22:55:26 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -151,14 +151,6 @@ file arch/arm/nvidia/tegra_fb.c tegra_f
attach nouveau at fdt with tegra_nouveau
file arch/arm/nvidia/tegra_nouveau.c tegra_nouveau
-# Console parameters
-defparam opt_tegra.h CONSADDR
-defparam opt_tegra.h CONSPEED
-defparam opt_tegra.h CONMODE
-
-# Memory parameters
-defparam opt_tegra.h MEMSIZE
-
# SOC parameters
defflag opt_tegra.h SOC_TEGRAK1
defflag opt_tegra.h SOC_TEGRAX1
Index: src/sys/arch/arm/nvidia/tegra_platform.c
diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.3 src/sys/arch/arm/nvidia/tegra_platform.c:1.4
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.3 Mon May 29 23:21:12 2017
+++ src/sys/arch/arm/nvidia/tegra_platform.c Tue May 30 22:55:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.3 2017/05/29 23:21:12 jmcneill Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.4 2017/05/30 22:55:26 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -28,12 +28,12 @@
#include "opt_tegra.h"
#include "opt_multiprocessor.h"
+#include "opt_fdt_arm.h"
-#include "com.h"
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.3 2017/05/29 23:21:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.4 2017/05/30 22:55:26 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -57,6 +57,9 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_platfo
#include <dev/usb/ukbdvar.h>
#endif
+#include <dev/ic/ns16550reg.h>
+#include <dev/ic/comreg.h>
+
#define DEVMAP_ALIGN(a) ((a) & ~L1_S_OFFSET)
#define DEVMAP_SIZE(s) roundup2((s), L1_S_SIZE)
#define DEVMAP_ENTRY(va, pa, sz) \
Index: src/sys/arch/arm/nvidia/tegra_reg.h
diff -u src/sys/arch/arm/nvidia/tegra_reg.h:1.22 src/sys/arch/arm/nvidia/tegra_reg.h:1.23
--- src/sys/arch/arm/nvidia/tegra_reg.h:1.22 Fri Apr 21 21:13:04 2017
+++ src/sys/arch/arm/nvidia/tegra_reg.h Tue May 30 22:55:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_reg.h,v 1.22 2017/04/21 21:13:04 jmcneill Exp $ */
+/* $NetBSD: tegra_reg.h,v 1.23 2017/05/30 22:55:26 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,8 +29,6 @@
#ifndef _ARM_TEGRA_REG_H
#define _ARM_TEGRA_REG_H
-#define CONSADDR_VA (CONSADDR - TEGRA_APB_BASE + TEGRA_APB_VBASE)
-
#define TEGRA_PCIE_OFFSET 0x01000000
#define TEGRA_PCIE_SIZE 0x3f000000
#define TEGRA_PCIE_RPCONF_BASE 0x01000000
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.1 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.2
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.1 Tue May 30 10:27:53 2017
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Tue May 30 22:55:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.1 2017/05/30 10:27:53 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.2 2017/05/30 22:55:27 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.1 2017/05/30 10:27:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.2 2017/05/30 22:55:27 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -104,7 +104,7 @@ static void
fdt_putchar(char c)
{
const struct arm_platform *plat = arm_fdt_platform();
- if (plat && plat->early_purchar)
+ if (plat && plat->early_putchar)
plat->early_putchar(c);
}
@@ -163,7 +163,9 @@ initarm(void *arg)
panic("Kernel does not support this device");
/* Early console may be available, announce ourselves. */
- DPRINT("NetBSD FDT init");
+ DPRINT("FDT<");
+ DPRINTN((uintptr_t)fdt_addr_r, 16);
+ DPRINT(">");
DPRINT(" devmap");
pmap_devmap_register(plat->devmap());
Index: src/sys/arch/evbarm/tegra/tegra_start.S
diff -u src/sys/arch/evbarm/tegra/tegra_start.S:1.14 src/sys/arch/evbarm/tegra/tegra_start.S:1.15
--- src/sys/arch/evbarm/tegra/tegra_start.S:1.14 Tue May 30 21:12:41 2017
+++ src/sys/arch/evbarm/tegra/tegra_start.S Tue May 30 22:55:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_start.S,v 1.14 2017/05/30 21:12:41 jmcneill Exp $ */
+/* $NetBSD: tegra_start.S,v 1.15 2017/05/30 22:55:27 jmcneill Exp $ */
/*-
* Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
#include "opt_tegra.h"
-#include "opt_com.h"
#include "opt_cpuoptions.h"
#include "opt_cputypes.h"
#include "opt_multiprocessor.h"
#include "opt_arm_debug.h"
+#include "opt_fdt_arm.h"
#include <arm/asm.h>
#include <arm/armreg.h>
@@ -42,7 +42,7 @@
#include <arm/nvidia/tegra_reg.h>
-RCSID("$NetBSD: tegra_start.S,v 1.14 2017/05/30 21:12:41 jmcneill Exp $")
+RCSID("$NetBSD: tegra_start.S,v 1.15 2017/05/30 22:55:27 jmcneill Exp $")
#if defined(VERBOSE_INIT_ARM) && defined(CONSADDR)
#define XPUTC(n) mov r0, n; bl xputc
