Convert CONFIG_ARMV7_PSCI_1_0 and CONFIG_ARMV7_PSCI_0_2 to Kconfig

This converts the following to Kconfig:
CONFIG_ARMV7_PSCI_1_0
CONFIG_ARMV7_PSCI_0_2

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index 14569e560b80b825f84adf1e121046bd881e446b..8eee801dce9b0c045845f3f09e299555ffde4fae 100644 (file)
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -41,6 +41,20 @@ config ARMV7_PSCI
        help
          Say Y here to enable PSCI support.
 
+choice
+       prompt "Supported PSCI version"
+       depends on ARMV7_PSCI
+       default ARMV7_PSCI_1_0
+       help
+         Select the supported PSCI version.
+
+config ARMV7_PSCI_1_0
+       bool "PSCI V1.0"
+
+config ARMV7_PSCI_0_2
+       bool "PSCI V0.2"
+endchoice
+
 config ARMV7_PSCI_NR_CPUS
        int "Maximum supported CPUs for PSCI"
        depends on ARMV7_NONSEC

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 0779b595c30c116bfe3d7dc39ae75bb508dfeb25..18800ea07aefbcf4b8e35ba04782ee0f02e349bf 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_ARMV7_PSCI_1_0
-
 #define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
 
 #define CONFIG_SYS_FSL_CLK

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 16c30d09dc73e4105e4406b62a295f6f4cee7fa3..6f7d051bd8ac60fe7ed5cc5457a880cbb0e7108b 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_ARMV7_PSCI_1_0
-
 #define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
 
 #define CONFIG_SYS_FSL_CLK

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 3ed578ffc061196a424d42667ab8290a96809c61..c17cabc02ff80ba60d019161f3f8baf2ebd49cc9 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -43,8 +43,6 @@
 
 #define CONFIG_ARMV7_SECURE_BASE       0x00900000
 
-#define CONFIG_ARMV7_PSCI_1_0
-
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #endif

diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index ed20b842ac967dbc39d60584018284998460b740..de9f8cb9bf2c48f35cdb3a5f051a01e0cf7fbb71 100644 (file)
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -12,7 +12,6 @@
 
 #ifndef CONFIG_TFABOOT
 /* PSCI support */
-#define CONFIG_ARMV7_PSCI_1_0
 #define CONFIG_ARMV7_SECURE_BASE               STM32_SYSRAM_BASE
 #define CONFIG_ARMV7_SECURE_MAX_SIZE           STM32_SYSRAM_SIZE
 #endif

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 03bbbab3cfc2622967a426e5b4f0e87694f034b5..d0841a7d55f9de1a348d1aa1124d678319880d63 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -39,8 +39,6 @@
 #define BOOTENV
 #endif
 
-#define CONFIG_ARMV7_PSCI_1_0
-
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
 #define CONFIG_TIMESTAMP

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e3bebe94c4c75e6bed0bc4f0c09227dfe2fe9219..da495f545b55e29a0cc2ebe6c3be691b390b05a3 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -44,7 +44,6 @@ CONFIG_ARMADA100
 CONFIG_ARMADA100_FEC
 CONFIG_ARMADA168
 CONFIG_ARMADA_39X
-CONFIG_ARMV7_PSCI_1_0
 CONFIG_ARMV7_SECURE_BASE
 CONFIG_ARMV7_SECURE_MAX_SIZE
 CONFIG_ARMV7_SECURE_RESERVE_SIZE