[src/trunk]: src/sys/arch Fix VERBOSE_INIT_ARM build with TEGRA kernel.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/50db684da6b7
branches:  trunk
changeset: 824281:50db684da6b7
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue May 30 22:55:26 2017 +0000

description:
Fix VERBOSE_INIT_ARM build with TEGRA kernel.

diffstat:

 sys/arch/arm/fdt/files.fdt           |   5 ++++-
 sys/arch/arm/nvidia/files.tegra      |  10 +---------
 sys/arch/arm/nvidia/tegra_platform.c |   9 ++++++---
 sys/arch/arm/nvidia/tegra_reg.h      |   4 +---
 sys/arch/evbarm/fdt/fdt_machdep.c    |  10 ++++++----
 sys/arch/evbarm/tegra/tegra_start.S  |   6 +++---
 6 files changed, 21 insertions(+), 23 deletions(-)

diffs (161 lines):

diff -r 812686051215 -r 50db684da6b7 sys/arch/arm/fdt/files.fdt
--- a/sys/arch/arm/fdt/files.fdt        Tue May 30 22:00:25 2017 +0000
+++ b/sys/arch/arm/fdt/files.fdt        Tue May 30 22:55:26 2017 +0000
@@ -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 @@
 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
diff -r 812686051215 -r 50db684da6b7 sys/arch/arm/nvidia/files.tegra
--- a/sys/arch/arm/nvidia/files.tegra   Tue May 30 22:00:25 2017 +0000
+++ b/sys/arch/arm/nvidia/files.tegra   Tue May 30 22:55:26 2017 +0000
@@ -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 @@
 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
diff -r 812686051215 -r 50db684da6b7 sys/arch/arm/nvidia/tegra_platform.c
--- a/sys/arch/arm/nvidia/tegra_platform.c      Tue May 30 22:00:25 2017 +0000
+++ b/sys/arch/arm/nvidia/tegra_platform.c      Tue May 30 22:55:26 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 #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)                        \
diff -r 812686051215 -r 50db684da6b7 sys/arch/arm/nvidia/tegra_reg.h
--- a/sys/arch/arm/nvidia/tegra_reg.h   Tue May 30 22:00:25 2017 +0000
+++ b/sys/arch/arm/nvidia/tegra_reg.h   Tue May 30 22:55:26 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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
diff -r 812686051215 -r 50db684da6b7 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Tue May 30 22:00:25 2017 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Tue May 30 22:55:26 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 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 @@
                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());
diff -r 812686051215 -r 50db684da6b7 sys/arch/evbarm/tegra/tegra_start.S
--- a/sys/arch/evbarm/tegra/tegra_start.S       Tue May 30 22:00:25 2017 +0000
+++ b/sys/arch/evbarm/tegra/tegra_start.S       Tue May 30 22:55:26 2017 +0000
@@ -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