summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2015-05-28 21:25:32 +0800
committerHans de Goede <hdegoede@redhat.com>2015-05-29 13:46:36 +0200
commitcc08ea4cff827f0929744d8d0134422e01c1f2b5 (patch)
tree7a1ef1551ec5b0a1a86f6a9eabe27118ef5f407d
parent073f29843847163c407878511cbf2a6cb36ed97b (diff)
downloadtalos-obmc-uboot-cc08ea4cff827f0929744d8d0134422e01c1f2b5.tar.gz
talos-obmc-uboot-cc08ea4cff827f0929744d8d0134422e01c1f2b5.zip
ARM: sunxi: Enable PSCI for sun6i
Now that we have a PSCI backend for sun6i, enable it. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--board/sunxi/Kconfig3
-rw-r--r--include/configs/sun6i.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index c6c876d4e7..64d2af8460 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 e1263f69a5..a0ebc7e977 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}
/*
OpenPOWER on IntegriCloud