Module Name: src
Committed By: matt
Date: Sat Sep 7 00:30:17 UTC 2013
Modified Files:
src/sys/arch/evbarm/cubie: cubie_start.S
Log Message:
Make sure the core register are mapped PA:VA too.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/cubie/cubie_start.S
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/cubie/cubie_start.S
diff -u src/sys/arch/evbarm/cubie/cubie_start.S:1.1 src/sys/arch/evbarm/cubie/cubie_start.S:1.2
--- src/sys/arch/evbarm/cubie/cubie_start.S:1.1 Tue Sep 3 18:01:33 2013
+++ src/sys/arch/evbarm/cubie/cubie_start.S Sat Sep 7 00:30:17 2013
@@ -95,7 +95,7 @@
#include <arm/allwinner/awin_reg.h>
#include <evbarm/cubie/platform.h>
-RCSID("$NetBSD: cubie_start.S,v 1.1 2013/09/03 18:01:33 matt Exp $")
+RCSID("$NetBSD: cubie_start.S,v 1.2 2013/09/07 00:30:17 matt Exp $")
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
@@ -164,11 +164,7 @@ _C_LABEL(cubie_start):
movw ip, #:lower16:start
movt ip, #:upper16:start
bx ip /* Jump to start (flushes pipeline). */
- nop
- nop
- nop
- nop
-
+
/* NOTREACHED */
#include <arm/cortex/a9_mpsubr.S>
@@ -189,6 +185,10 @@ _C_LABEL(cubie_start):
(AWIN_CORE_SIZE + L1_S_SIZE - 1) / L1_S_SIZE,
L1_S_PROTO | L1_S_APv7_KRW)
+ /* Map AWIN CORE (so console will work) */
+ MMU_INIT(AWIN_CORE_PBASE, AWIN_CORE_PBASE,
+ (AWIN_CORE_SIZE + L1_S_SIZE - 1) / L1_S_SIZE,
+ L1_S_PROTO | L1_S_APv7_KRW)
/* end of table */
MMU_INIT(0, 0, 0, 0)
