armv7: ls1021a: Convert CONFIG_LS1_DEEP_SLEEP to Kconfig option

Move this option to Kconfig and clean up existing uses.

Signed-off-by: York Sun <york.sun@nxp.com>
CC: Hongbo Zhang <hongbo.zhang@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1bc45ed..5073930 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -822,6 +822,7 @@ config TARGET_LS1021AQDS
        select SUPPORT_SPL
        select ARCH_LS1021A
        select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP
 
 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
@@ -829,6 +830,7 @@ config TARGET_LS1021ATWR
        select SUPPORT_SPL
        select ARCH_LS1021A
        select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP
 
 config TARGET_LS1043AQDS
        bool "Support ls1043aqds"

diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index e88a05e..920eb4a 100644 (file)
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -1,3 +1,6 @@
 config ARCH_LS1021A
        bool "Freescale Layerscape LS1021A SoC"
        select SYS_FSL_ERRATUM_A010315
+
+config LS1_DEEP_SLEEP
+       bool "Freescale Layerscape 1 deep sleep"

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 5aaecc7..7a256da 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -10,7 +10,6 @@
 #define CONFIG_LS102XA
 
 #define CONFIG_ARMV7_PSCI_1_0
-#define CONFIG_LS1_DEEP_SLEEP
 
 #define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
 

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index ef238a4..90ae770 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -10,7 +10,6 @@
 #define CONFIG_LS102XA
 
 #define CONFIG_ARMV7_PSCI_1_0
-#define CONFIG_LS1_DEEP_SLEEP
 
 #define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR