Index: sys/arch/arm/cortex/a9_mpsubr.S
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/cortex/a9_mpsubr.S,v
retrieving revision 1.45
diff -u -p -r1.45 a9_mpsubr.S
--- sys/arch/arm/cortex/a9_mpsubr.S	17 Dec 2015 08:02:42 -0000	1.45
+++ sys/arch/arm/cortex/a9_mpsubr.S	19 Dec 2015 12:44:21 -0000
@@ -347,6 +347,7 @@ xputc:
 cortex_init:
 	mov	r10, lr				// save lr
 
+#if defined(CPU_CORTEXA7) || defined(CPU_CORTEXA15) || defined(CPU_CORTEXA17)
 	/* Leave HYP mode and move into supervisor mode with IRQs/FIQs disabled. */
 	mrs	r0, cpsr
 	and	r0, r0, #(PSR_MODE)	/* Mode is in the low 5 bits of CPSR */
@@ -360,11 +361,15 @@ cortex_init:
 	orr	r0, r0, #(I32_bit | F32_bit)
 	msr	spsr_cxsf, r0
 	/* Exit hypervisor mode */
-	adr	lr, 1f
+	adr	lr, 2f
 	msr	elr_hyp, lr
 	eret
+#endif
+
 1:
+	cpsid	if, #PSR_SVC32_MODE		// SVC32 with no interrupts
 
+2:
 	mov	r0, #0
 	msr	spsr_sxc, r0			// set SPSR[23:8] to known value
 
Index: sys/arch/evbarm/conf/CUBIEBOARD
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/CUBIEBOARD,v
retrieving revision 1.44
diff -u -p -r1.44 CUBIEBOARD
--- sys/arch/evbarm/conf/CUBIEBOARD	16 Nov 2015 12:35:54 -0000	1.44
+++ sys/arch/evbarm/conf/CUBIEBOARD	19 Dec 2015 12:44:24 -0000
@@ -10,6 +10,8 @@ include	"arch/evbarm/conf/std.awin"
 
 no makeoptions	BOARDTYPE
 makeoptions	BOARDTYPE="cubieboard"
+no makeoptions	CPUFLAGS
+makeoptions	CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
 #options 	UVMHIST,UVMHIST_PRINT
 options 	ALLWINNER_A10
 options 	ALLWINNER_A20
Index: sys/arch/evbarm/conf/std.awin
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.awin,v
retrieving revision 1.8
diff -u -p -r1.8 std.awin
--- sys/arch/evbarm/conf/std.awin	29 Nov 2015 19:52:03 -0000	1.8
+++ sys/arch/evbarm/conf/std.awin	19 Dec 2015 12:44:24 -0000
@@ -27,7 +27,7 @@ makeoptions	KERNEL_BASE_PHYS="0x40008000
 makeoptions	KERNEL_BASE_VIRT="0x80008000"
 makeoptions	BOARDTYPE="awin"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.awin"
-makeoptions	CPUFLAGS="-mcpu=cortex-a8 -mfpu=neon"
+makeoptions	CPUFLAGS="-mcpu=generic-armv7-a -mfpu=neon"
 
 options 	ARM_INTR_IMPL="<arch/arm/allwinner/awin_intr.h>"
 options		ARM_GENERIC_TODR