Index: sys/arm/amlogic/aml8726/aml8726_machdep.c
===================================================================
--- sys/arm/amlogic/aml8726/aml8726_machdep.c
+++ sys/arm/amlogic/aml8726/aml8726_machdep.c
@@ -38,6 +38,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
+#include <machine/cpufunc.h>
 #include <machine/devmap.h>
 #include <machine/machdep.h>
 #include <machine/platform.h>
@@ -114,6 +116,19 @@
 	aml8726_identify_soc();
 
 	/*
+	 * My aml8726-m3 development box which identifies the CPU as
+	 * a Cortex A9-r2 rev 4 randomly locks up during boot when WFI
+	 * is used.
+	 */
+	switch (aml8726_soc_hw_rev) {
+	case AML_SOC_HW_REV_M3:
+		cpufuncs.cf_sleep = (void *)cpufunc_nullop;
+		break;
+	default:
+		break;
+	}
+
+	/*
 	 * This FDT fixup should arguably be called through fdt_fixup_table,
 	 * however currently there's no mechanism to specify a fixup which
 	 * should always be invoked.