ARM: armv7: move CONFIG_ARMV7_PSCI to Kconfig

Add ARCH_SUPPORT_PSCI as a non-configurable option that platforms
can select.  Then, move CONFIG_ARMV7_PSCI, which is automatically
enabled if both ARMV7_NONSEC and ARCH_SUPPORT_PSCI are enabled.

Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c871eaf4e39a5eef5f3436a61c6d8e82e324427f..37fee43d9a81b957b89d33d37406e31f4ccbf387 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -816,10 +816,13 @@ config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
        select SUPPORT_SPL
+       select ARCH_SUPPORT_PSCI
+
 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
        select CPU_V7
        select SUPPORT_SPL
+       select ARCH_SUPPORT_PSCI
 
 config TARGET_LS1043AQDS
        bool "Support ls1043aqds"

diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index 41c6639c138c1bc782e30d221cc45e1815b87331..4390f59987d62253ca4e58c2d62864e8e6d2bf17 100644 (file)
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -6,6 +6,9 @@ config CPU_V7_HAS_NONSEC
 config CPU_V7_HAS_VIRT
         bool
 
+config ARCH_SUPPORT_PSCI
+        bool
+
 config ARMV7_NONSEC
        bool "Enable support for booting in non-secure mode" if EXPERT
        depends on CPU_V7_HAS_NONSEC
@@ -31,6 +34,13 @@ config ARMV7_VIRT
        ---help---
        Say Y here to boot in hypervisor (HYP) mode when booting non-secure.
 
+config ARMV7_PSCI
+       bool "Enable PSCI support" if EXPERT
+       depends on ARMV7_NONSEC && ARCH_SUPPORT_PSCI
+       default y
+       help
+         Say Y here to enable PSCI support.
+
 config ARMV7_LPAE
        bool "Use LPAE page table format" if EXPERT
        depends on CPU_V7

diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig
index 5fdc8dd5836c075f47e27d17e1bffb2748b0e177..fb00b8c67c4b3ac91dcc4908c707f77f4f27db51 100644 (file)
--- a/arch/arm/cpu/armv7/mx7/Kconfig
+++ b/arch/arm/cpu/armv7/mx7/Kconfig
@@ -5,6 +5,7 @@ config MX7
        select ROM_UNIFIED_SECTIONS
        select CPU_V7_HAS_VIRT
        select CPU_V7_HAS_NONSEC
+       select ARCH_SUPPORT_PSCI
        default y
 
 config MX7D

diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig
index 800b315b371b3fbd3ad4ae629c01f45c12da971e..df7746228386fbab489f480029f9acab9cdb7419 100644 (file)
--- a/arch/arm/mach-tegra/tegra124/Kconfig
+++ b/arch/arm/mach-tegra/tegra124/Kconfig
@@ -8,6 +8,7 @@ config TARGET_JETSON_TK1
        bool "NVIDIA Tegra124 Jetson TK1 board"
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
 
 config TARGET_CEI_TK1_SOM
        bool "Colorado Engineering Inc Tegra124 TK1-som board"

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 89614581bb1ff6329f038d40a3420aaaa616a9d6..7bee6c7a299099708080756a4450bc36a291e750 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -8,6 +8,7 @@ config ARCH_UNIPHIER_32BIT
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select ARMV7_NONSEC
+       select ARCH_SUPPORT_PSCI
 
 config ARCH_UNIPHIER_64BIT
        bool

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 3ec011aa1b560f9548d94307ab8f6f040d4df08c..68443c99316e61197aadefae5fc6220ea5f66c65 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -37,6 +37,7 @@ config MACH_SUN6I
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -46,6 +47,7 @@ config MACH_SUN7I
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN4I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -55,6 +57,7 @@ config MACH_SUN8I_A23
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -64,6 +67,7 @@ config MACH_SUN8I_A33
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -79,6 +83,7 @@ config MACH_SUN8I_H3
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 2b172a50730a49f1a330dd67eaa4c5cd4862ab42..1eba74a5368c6547c75829fa34c7fa54b5b03b50 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -60,7 +60,6 @@
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
-#define CONFIG_ARMV7_PSCI                      1
 #define CONFIG_ARMV7_PSCI_NR_CPUS              4
 /* Reserve top 1M for secure RAM */
 #define CONFIG_ARMV7_SECURE_BASE               0xfff00000

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 47180f9ce8b9d6cf13e4612099ab1726a2d1d063..86969a12321bc45ef7a47416447b164f425609b2 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -9,7 +9,6 @@
 
 #define CONFIG_LS102XA
 
-#define CONFIG_ARMV7_PSCI
 #define CONFIG_ARMV7_PSCI_1_0
 #define CONFIG_ARMV7_PSCI_NR_CPUS      CONFIG_MAX_CPUS
 

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 2f19950dffe0b04bb9263f8b217454f6c1d48c8b..d0fc7ff0feb950f80e41570e607adbda0d446b78 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -9,7 +9,6 @@
 
 #define CONFIG_LS102XA
 
-#define CONFIG_ARMV7_PSCI
 #define CONFIG_ARMV7_PSCI_1_0
 #define CONFIG_ARMV7_PSCI_NR_CPUS      CONFIG_MAX_CPUS
 

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 7295fa619989a54effa4d83a3bdad6cb09c49e48..52c0d0fff3fb9ad1dc46d088339bf7ff4270facc 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -72,7 +72,6 @@
 #define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 
-#define CONFIG_ARMV7_PSCI
 #define CONFIG_ARMV7_PSCI_NR_CPUS      2
 #define CONFIG_ARMV7_SECURE_BASE       0x00900000
 

diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h
index 0625502f44b49fa4980b59834540a7f2eb623b0d..41552c411396d78f473e876593536213fc90d2f2 100644 (file)
--- a/include/configs/sun6i.h
+++ b/include/configs/sun6i.h
@@ -22,7 +22,6 @@
 
 #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_ARMV7_SECURE_MAX_SIZE    (64 * 1024) /* 64 KB */

diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index e9074d5dfbf9817cdb483d6d495c8282619981de..63760c50f10e771c804ba3e09454e2c2834a635f 100644 (file)
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_SUNXI_USB_PHYS  3
 
-#define CONFIG_ARMV7_PSCI              1
 #define CONFIG_ARMV7_PSCI_NR_CPUS      2
 #define CONFIG_ARMV7_SECURE_BASE       SUNXI_SRAM_B_BASE
 #define CONFIG_ARMV7_SECURE_MAX_SIZE   (64 * 1024) /* 64 KB */

diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
index b9a8731ee8b827868c050741303255c3cfdcaba2..151ffdc8e64625b504be4824b32fd1b4ac7e7f7a 100644 (file)
--- a/include/configs/sun8i.h
+++ b/include/configs/sun8i.h
@@ -27,7 +27,6 @@
 #endif
 
 #ifndef CONFIG_MACH_SUN8I_A83T
-#define CONFIG_ARMV7_PSCI              1
 #if defined(CONFIG_MACH_SUN8I_A23)
 #define CONFIG_ARMV7_PSCI_NR_CPUS      2
 #elif defined(CONFIG_MACH_SUN8I_A33)

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 55ba99c691b08e4293c99b789d461a84df33ae6a..66696c2fc83498e5d5f0de3c67c980f93b387421 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -11,7 +11,6 @@
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
 
-#define CONFIG_ARMV7_PSCI
 #define CONFIG_ARMV7_PSCI_1_0
 #define CONFIG_ARMV7_PSCI_NR_CPUS   4