Module Name: src
Committed By: kiyohara
Date: Wed Nov 20 12:52:25 UTC 2013
Modified Files:
src/sys/arch/evbarm/marvell: marvell_machdep.c
Log Message:
Initialize mvTclk in SOC_getclks() before call consinit().
And more fast call set_cpufuncs().
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/marvell/marvell_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/evbarm/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.22 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.23
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.22 Mon Sep 30 12:57:53 2013
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c Wed Nov 20 12:52:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_machdep.c,v 1.22 2013/09/30 12:57:53 kiyohara Exp $ */
+/* $NetBSD: marvell_machdep.c,v 1.23 2013/11/20 12:52:24 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.22 2013/09/30 12:57:53 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.23 2013/11/20 12:52:24 kiyohara Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
@@ -218,6 +218,12 @@ initarm(void *arg)
mvsoc_bootstrap(MARVELL_INTERREGS_VBASE);
+ /*
+ * Heads up ... Setup the CPU / MMU / TLB functions
+ */
+ if (set_cpufuncs())
+ panic("cpu not recognized!");
+
#if (defined(ORION) || defined(KIRKWOOD) || defined(MV78XX0)) && \
defined(ARMADAXP)
int i;
@@ -233,12 +239,6 @@ initarm(void *arg)
pmap_devmap_bootstrap((vaddr_t)read_ttb(), marvell_devmap);
/*
- * Heads up ... Setup the CPU / MMU / TLB functions
- */
- if (set_cpufuncs())
- panic("cpu not recognized!");
-
- /*
* U-Boot doesn't use the virtual memory.
*
* Physical Address Range Description
@@ -252,16 +252,6 @@ initarm(void *arg)
cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT);
- consinit();
-
- /* Talk to the user */
-#ifndef EVBARM_BOARDTYPE
-#define EVBARM_BOARDTYPE Marvell
-#endif
-#define BDSTR(s) _BDSTR(s)
-#define _BDSTR(s) #s
- printf("\nNetBSD/evbarm (" BDSTR(EVBARM_BOARDTYPE) ") booting ...\n");
-
/* Get ready for splfoo() */
switch (mvsoc_model()) {
#ifdef ORION
@@ -354,6 +344,16 @@ initarm(void *arg)
/* NOTREACHED */
}
+ consinit();
+
+ /* Talk to the user */
+#ifndef EVBARM_BOARDTYPE
+#define EVBARM_BOARDTYPE Marvell
+#endif
+#define BDSTR(s) _BDSTR(s)
+#define _BDSTR(s) #s
+ printf("\nNetBSD/evbarm (" BDSTR(EVBARM_BOARDTYPE) ") booting ...\n");
+
/* Reset PCI-Express space to window register. */
window = mvsoc_target(memtag, &target, &attr, NULL, NULL);
write_mlmbreg(MVSOC_MLMB_WCR(window),
