Convert CONFIG_DEEP_SLEEP to Kconfig

This converts the following to Kconfig:
   CONFIG_DEEP_SLEEP

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 3322f06..7c41f8d 100644 (file)
--- a/README
+++ b/README
@@ -403,10 +403,6 @@ The following options need to be configured:
                This CONFIG is defined when the CPC is configured as SRAM at the
                time of U-Boot entry and is required to be re-initialized.
 
-               CONFIG_DEEP_SLEEP
-               Indicates this SoC supports deep sleep feature. If deep sleep is
-               supported, core will start to execute uboot when wakes up.
-
 - Generic CPU options:
                CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN
 

diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
index 300b01e..b41d93b 100644 (file)
--- a/board/freescale/common/Kconfig
+++ b/board/freescale/common/Kconfig
@@ -22,6 +22,13 @@ config CMD_ESBC_VALIDATE
            esbc_validate - validate signature using RSA verification
            esbc_halt - put the core in spin loop (Secure Boot Only)
 
+config DEEP_SLEEP
+       bool "Enable SoC deep sleep feature"
+       default y if ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
+       help
+         Indicates this SoC supports deep sleep feature. If deep sleep is
+         supported, core will start to execute uboot when wakes up.
+
 config FSL_USE_PCA9547_MUX
        bool "Enable PCA9547 I2C Mux on Freescale boards"
        help

diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig
index eac666d..b6e418c 100644 (file)
--- a/configs/ls1021aiot_qspi_defconfig
+++ b/configs/ls1021aiot_qspi_defconfig
@@ -11,6 +11,7 @@ CONFIG_SYS_I2C_MXC_I2C2=y
 CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
+# CONFIG_DEEP_SLEEP is not set
 CONFIG_AHCI=y
 CONFIG_SYS_LOAD_ADDR=0x82000000
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig
index 407b693..74043f6 100644 (file)
--- a/configs/ls1021aiot_sdcard_defconfig
+++ b/configs/ls1021aiot_sdcard_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
 CONFIG_SPL_TEXT_BASE=0x10000000
+# CONFIG_DEEP_SLEEP is not set
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL=y

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index d9c72a8..5ecc897 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -20,11 +20,6 @@
 #define CONFIG_SYS_FSL_CPC             /* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
 
-/* support deep sleep */
-#ifdef CONFIG_ARCH_T1024
-#define CONFIG_DEEP_SLEEP
-#endif
-
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_PAD_TO              0x40000

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 562f7b3..76b0918 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -70,9 +70,6 @@
 /* High Level Configuration Options */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
 
-/* support deep sleep */
-#define CONFIG_DEEP_SLEEP
-
 #ifndef CONFIG_RESET_VECTOR_ADDRESS
 #define CONFIG_RESET_VECTOR_ADDRESS    0xeffffffc
 #endif

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 773cc9b..dd37939 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DEEP_SLEEP
-
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
 

diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 3742203..2fb4c18 100644 (file)
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -6,8 +6,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DEEP_SLEEP
-
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
 

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index b607dd3..cadcf22 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DEEP_SLEEP
-
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE