Module Name: src
Committed By: riz
Date: Thu Aug 29 15:46:17 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: arm32_kvminit.c
src/sys/arch/arm/broadcom: bcm53xx_board.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
Log Message:
Fix typo: VERBOSE_INIT_ARM, not VERBOSE_ARM_INIT. From
Dennis Ferguson in PR#48163.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/arm32/arm32_kvminit.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/broadcom/bcm53xx_board.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/beagle/beagle_machdep.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/arm32/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.21 src/sys/arch/arm/arm32/arm32_kvminit.c:1.22
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.21 Sat Jun 22 00:44:17 2013
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Thu Aug 29 15:46:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_kvminit.c,v 1.21 2013/06/22 00:44:17 matt Exp $ */
+/* $NetBSD: arm32_kvminit.c,v 1.22 2013/08/29 15:46:17 riz Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.21 2013/06/22 00:44:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.22 2013/08/29 15:46:17 riz Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -505,7 +505,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
add_pages(bmi, &bmi->bmi_io_l2pt);
}
-#ifdef VERBOSE_ARM_INIT
+#ifdef VERBOSE_INIT_ARM
printf("%s: allocating stacks\n", __func__);
#endif
Index: src/sys/arch/arm/broadcom/bcm53xx_board.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_board.c:1.15 src/sys/arch/arm/broadcom/bcm53xx_board.c:1.16
--- src/sys/arch/arm/broadcom/bcm53xx_board.c:1.15 Tue Feb 19 02:30:55 2013
+++ src/sys/arch/arm/broadcom/bcm53xx_board.c Thu Aug 29 15:46:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_board.c,v 1.15 2013/02/19 02:30:55 matt Exp $ */
+/* $NetBSD: bcm53xx_board.c,v 1.16 2013/08/29 15:46:17 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.15 2013/02/19 02:30:55 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.16 2013/08/29 15:46:17 riz Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -458,7 +458,7 @@ bcm53xx_cpu_softc_init(struct cpu_info *
void
bcm53xx_print_clocks(void)
{
-#if defined(VERBOSE_ARM_INIT)
+#if defined(VERBOSE_INIT_ARM)
const struct bcm53xx_clock_info * const clk = &cpu_softc.cpu_clk;
printf("ref clk = %u (%#x)\n", clk->clk_ref, clk->clk_ref);
printf("sys clk = %u (%#x)\n", clk->clk_sys, clk->clk_sys);
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.54 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.55
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.54 Tue Jul 30 22:23:45 2013
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Thu Aug 29 15:46:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.54 2013/07/30 22:23:45 matt Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.55 2013/08/29 15:46:17 riz Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.54 2013/07/30 22:23:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.55 2013/08/29 15:46:17 riz Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -489,7 +489,7 @@ initarm(void *arg)
OMAP_L4_PERIPHERAL_VBASE - OMAP_L4_PERIPHERAL_BASE;
arml2cc_init(&omap_bs_tag, pl310_bh, 0);
#endif
-#if defined(TI_AM335X) && defined(VERBOSE_ARM_INIT)
+#if defined(TI_AM335X) && defined(VERBOSE_INIT_ARM)
am335x_cpu_clk(); // find our CPU speed.
#endif
#if 1
