ARM: uniphier: enable PSCI sysreset for uniphier_v8_defconfig
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 20 Apr 2017 07:54:42 +0000 (16:54 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 20 Apr 2017 14:49:50 +0000 (23:49 +0900)
This configuration is supposed to be used with ARM Trusted Firmware,
so the SYSTEM_RESET is implemented in BL31.  Invoke PSCI instead of
U-Boot's own reset code because we need to coordinate with SCP
(System Control Processor) for the system-level power management.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
arch/arm/mach-uniphier/Makefile
configs/uniphier_v8_defconfig

index 124a1c6e9813baa3a823f18b02a62d275eeb1087..7a0b25ad51a5464d6b400705ddc60aff55bad3ff 100644 (file)
@@ -16,7 +16,9 @@ obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o
 obj-y += dram_init.o
 obj-y += board_init.o
 obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
+ifndef CONFIG_SYSRESET
 obj-y += reset.o
+endif
 
 obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/ micro-support-card.o
 obj-y += pinctrl-glue.o
index c743fabb677e23671df4605ffabd6036a9c83448..73bdaa872949444b39d257081bbf6cfc9b99f39a 100644 (file)
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARM_SMCCC=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
@@ -29,6 +30,8 @@ CONFIG_I2C_EEPROM=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_CADENCE=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_PSCI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y