Module Name: src
Committed By: skrll
Date: Tue Nov 12 17:14:39 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
src/sys/arch/evbarm/rpi: rpi_start.S
Log Message:
Add CPU_CONTROL_UNAL_ENABLE. New ABIs demand unaligned accesses!
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/rpi/rpi_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/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.128 src/sys/arch/arm/arm/cpufunc.c:1.129
--- src/sys/arch/arm/arm/cpufunc.c:1.128 Wed Nov 6 02:36:36 2013
+++ src/sys/arch/arm/arm/cpufunc.c Tue Nov 12 17:14:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos Exp $ */
+/* $NetBSD: cpufunc.c,v 1.129 2013/11/12 17:14:39 skrll Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.129 2013/11/12 17:14:39 skrll Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -3092,6 +3092,7 @@ arm11x6_setup(char *args)
CPU_CONTROL_32BD_ENABLE |
CPU_CONTROL_LABT_ENABLE |
CPU_CONTROL_SYST_ENABLE |
+ CPU_CONTROL_UNAL_ENABLE |
CPU_CONTROL_IC_ENABLE;
/*
Index: src/sys/arch/evbarm/rpi/rpi_start.S
diff -u src/sys/arch/evbarm/rpi/rpi_start.S:1.7 src/sys/arch/evbarm/rpi/rpi_start.S:1.8
--- src/sys/arch/evbarm/rpi/rpi_start.S:1.7 Sun Sep 23 15:56:32 2012
+++ src/sys/arch/evbarm/rpi/rpi_start.S Tue Nov 12 17:14:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_start.S,v 1.7 2012/09/23 15:56:32 skrll Exp $ */
+/* $NetBSD: rpi_start.S,v 1.8 2013/11/12 17:14:39 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -87,7 +87,7 @@
#include <arm/armreg.h>
#include "assym.h"
-RCSID("$NetBSD: rpi_start.S,v 1.7 2012/09/23 15:56:32 skrll Exp $")
+RCSID("$NetBSD: rpi_start.S,v 1.8 2013/11/12 17:14:39 skrll Exp $")
/*
* Workaround Erratum 411920
@@ -277,6 +277,7 @@ Lcontrol_set:
CPU_CONTROL_SYST_ENABLE | \
(1 << 16) | /* SBO - Global enable for data tcm */ \
(1 << 18) | /* SBO - Global enable for insn tcm */ \
+ CPU_CONTROL_UNAL_ENABLE | \
CPU_CONTROL_IC_ENABLE
