Module Name: src
Committed By: skrll
Date: Mon Jan 2 21:46:59 UTC 2017
Modified Files:
src/sys/arch/evbarm/gumstix: gumstix_start.S
Log Message:
Fix boot on Gumstix Verdex boards.
Reported by smesgr on port-arm
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gumstix/gumstix_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/gumstix/gumstix_start.S
diff -u src/sys/arch/evbarm/gumstix/gumstix_start.S:1.14 src/sys/arch/evbarm/gumstix/gumstix_start.S:1.15
--- src/sys/arch/evbarm/gumstix/gumstix_start.S:1.14 Sat Oct 15 15:27:18 2016
+++ src/sys/arch/evbarm/gumstix/gumstix_start.S Mon Jan 2 21:46:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_start.S,v 1.14 2016/10/15 15:27:18 kiyohara Exp $ */
+/* $NetBSD: gumstix_start.S,v 1.15 2017/01/02 21:46:59 skrll Exp $ */
/*
* Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -71,7 +71,7 @@
#include <arm/omap/omap2_obioreg.h>
#endif
-RCSID("$NetBSD: gumstix_start.S,v 1.14 2016/10/15 15:27:18 kiyohara Exp $")
+RCSID("$NetBSD: gumstix_start.S,v 1.15 2017/01/02 21:46:59 skrll Exp $")
/*
* CPWAIT -- Canonical method to wait for CP15 update.
@@ -212,6 +212,8 @@ _C_LABEL(gumstix_start):
cmp r1, #0 /* Check MPIDR_MP (bit 31) */
orrlt r1, r0, #TTBR_MPATTR
orrge r1, r0, #TTBR_UPATTR
+#else
+ mov r1, r0
#endif
mcr p15, 0, r1, c2, c0, 0 /* Set TTB */
mcr p15, 0, r1, c8, c7, 0 /* Flush TLB */
