From owner-svn-src-all@FreeBSD.ORG  Sun Mar 31 22:43:16 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E5168557;
 Sun, 31 Mar 2013 22:43:16 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D7A3960F;
 Sun, 31 Mar 2013 22:43:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VMhGa8018953;
 Sun, 31 Mar 2013 22:43:16 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VMhGcV018951;
 Sun, 31 Mar 2013 22:43:16 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201303312243.r2VMhGcV018951@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 31 Mar 2013 22:43:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248962 - head/sys/boot/arm/uboot
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Mar 2013 22:43:17 -0000

Author: ian
Date: Sun Mar 31 22:43:16 2013
New Revision: 248962
URL: http://svnweb.freebsd.org/changeset/base/248962

Log:
  When running on armv6, set alignment checking to modulo-4 mode rather
  than modulo-8, because clang emits ldrd and strd instructions for
  addresses that are only 4-byte aligned

Modified:
  head/sys/boot/arm/uboot/start.S

Modified: head/sys/boot/arm/uboot/start.S
==============================================================================
--- head/sys/boot/arm/uboot/start.S	Sun Mar 31 22:42:25 2013	(r248961)
+++ head/sys/boot/arm/uboot/start.S	Sun Mar 31 22:43:16 2013	(r248962)
@@ -27,6 +27,7 @@
  */
 
 #include <machine/asm.h>
+#include <machine/armreg.h>
 
 /*
  * Entry point to the loader that U-Boot passes control to.
@@ -42,6 +43,13 @@ _start:
 	ldr	ip, =saved_regs
 	str	r8, [ip, #0]
 
+#ifdef _ARM_ARCH_6
+	mrc     p15, 0, r2, c1, c0, 0
+	orr	r2, r2, #(CPU_CONTROL_UNAL_ENABLE)
+	orr	r2, r2, #(CPU_CONTROL_AFLT_ENABLE)
+	mcr     p15, 0, r2, c1, c0, 0
+#endif
+
 	/* Start loader */
 	b	main