diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index c6c876d4e70e3b9d61befc95516c6c289da626f4..64d2af8460eac692c963a3b56eaac8c4bfe40ad0 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -35,8 +35,11 @@ config MACH_SUN5I
 config MACH_SUN6I
 	bool "sun6i (Allwinner A31)"
 	select CPU_V7
+	select CPU_V7_HAS_NONSEC
+	select CPU_V7_HAS_VIRT
 	select SUNXI_GEN_SUN6I
 	select SUPPORT_SPL
+	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
 
 config MACH_SUN7I
 	bool "sun7i (Allwinner A20)"
diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h
index e1263f69a5644bf44e2f26043ef6d616f23f497b..a0ebc7e97705f6b6cc40b2367090f5535e507031 100644
--- a/include/configs/sun6i.h
+++ b/include/configs/sun6i.h
@@ -22,6 +22,11 @@
 
 #define CONFIG_SUNXI_USB_PHYS	3
 
+#define CONFIG_ARMV7_PSCI		1
+#define CONFIG_ARMV7_PSCI_NR_CPUS	4
+#define CONFIG_ARMV7_SECURE_BASE	SUNXI_SRAM_B_BASE
+#define CONFIG_TIMER_CLK_FREQ		24000000
+
 #define CONFIG_NAND_SUNXI_GPC_PORTS	{24, 25, 26}
 
 /*