Module Name: src
Committed By: matt
Date: Fri Aug 10 02:33:11 UTC 2012
Modified Files:
src/sys/arch/evbarm/marvell: marvell_machdep.c
Log Message:
Make mvsoc_bootstrap (so it can initial an early console).
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.14
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.13 Fri Aug 3 08:01:35 2012
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c Fri Aug 10 02:33:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_machdep.c,v 1.13 2012/08/03 08:01:35 kiyohara Exp $ */
+/* $NetBSD: marvell_machdep.c,v 1.14 2012/08/10 02:33:11 matt 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.13 2012/08/03 08:01:35 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.14 2012/08/10 02:33:11 matt Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
@@ -294,11 +294,11 @@ initarm(void *arg)
u_int l1pagetable;
int loop, pt_index, cs, memtag = 0, iotag = 0, window;
+ mvsoc_bootstrap(MARVELL_INTERREGS_VBASE);
+
/* map some peripheral registers */
pmap_devmap_bootstrap((vaddr_t)read_ttb(), marvell_devmap);
- mvsoc_bootstrap(MARVELL_INTERREGS_VBASE);
-
/* Get ready for splfoo() */
switch (mvsoc_model()) {
#ifdef ORION
