From: York Sun Date: Mon, 26 Sep 2016 15:09:29 +0000 (-0700) Subject: armv7: ls1021a: Convert CONFIG_LS1_DEEP_SLEEP to Kconfig option X-Git-Tag: v2016.11-rc1~40^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5e8bd7e117157eee591e377c80e024f12318cf9d;p=u-boot 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 CC: Hongbo Zhang Reviewed-by: Tom Rini --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1bc45ed28e..5073930419 100644 --- 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 e88a05e9a6..920eb4ad98 100644 --- 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 5aaecc718e..7a256da1f2 100644 --- 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 ef238a4c8f..90ae770eef 100644 --- 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