Module Name: src
Committed By: matt
Date: Fri Mar 7 16:38:28 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_board.c
Log Message:
Adjust the VERBOSE_ARM_INIT printfs to always the status of both cpus and
the number of cpus, regardless of MULTIPROCESSOR.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/allwinner/awin_board.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/allwinner/awin_board.c
diff -u src/sys/arch/arm/allwinner/awin_board.c:1.10 src/sys/arch/arm/allwinner/awin_board.c:1.11
--- src/sys/arch/arm/allwinner/awin_board.c:1.10 Wed Feb 26 00:30:56 2014
+++ src/sys/arch/arm/allwinner/awin_board.c Fri Mar 7 16:38:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_board.c,v 1.10 2014/02/26 00:30:56 matt Exp $ */
+/* $NetBSD: awin_board.c,v 1.11 2014/03/07 16:38:28 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.10 2014/02/26 00:30:56 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.11 2014/03/07 16:38:28 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -183,7 +183,6 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u
printf("\n");
#endif
-#ifdef MULTIPROCESSOR
#ifdef VERBOSE_INIT_ARM
uint32_t s0 = bus_space_read_4(&awin_bs_tag, awin_core_bsh,
AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU0_STATUS_REG);
@@ -191,11 +190,16 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u
AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU1_STATUS_REG);
printf("%s: cpu status: 0=%#x 1=%#x\n", __func__, s0, s1);
#endif
+
+#if !defined(MULTIPROCESSOR) && defined(VERBOSE_ARM_INIT)
+ u_int arm_cpu_max;
+#endif
+#if defined(MULTIPROCESSOR) || defined(VERBOSE_ARM_INIT)
arm_cpu_max = 1 + __SHIFTOUT(armreg_l2ctrl_read(), L2CTRL_NUMCPU);
+#endif
#ifdef VERBOSE_INIT_ARM
printf("%s: %d cpus present\n", __func__, arm_cpu_max);
#endif
-#endif
}
void
