This converts the following to Kconfig: CONFIG_FSL_DEVICE_DISABLE
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/cpu/armv7/ls102xa/Kconfig | 4 ++++ include/configs/km/pg-wcom-ls102xa.h | 1 - include/configs/ls1021aiot.h | 2 -- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atsn.h | 2 -- include/configs/ls1021atwr.h | 2 -- 6 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index e75a895e0086..369e68b8193b 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -1,5 +1,6 @@ config ARCH_LS1021A bool + select FSL_DEVICE_DISABLE select FSL_IFC if !QSPI_BOOT && !SD_BOOT_QSPI select SYS_FSL_DDR_BE if SYS_FSL_DDR select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR @@ -30,6 +31,9 @@ config ARCH_LS1021A menu "LS102xA architecture" depends on ARCH_LS1021A
+config FSL_DEVICE_DISABLE + bool + config LS1_DEEP_SLEEP bool "Deep sleep"
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 7307c495c38e..6ccb4f07e3be 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -168,7 +168,6 @@
#define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256 -#define CONFIG_FSL_DEVICE_DISABLE
/* * Miscellaneous configurable options diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index b058308ecdbe..3063635592e2 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -95,8 +95,6 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256
-#define CONFIG_FSL_DEVICE_DISABLE - #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 5494b71e2b21..137d459c291e 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -279,8 +279,6 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256
-#define CONFIG_FSL_DEVICE_DISABLE - #ifdef CONFIG_LPUART #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index bc9eac700e98..052a15658d71 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -70,8 +70,6 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256
-#define CONFIG_FSL_DEVICE_DISABLE - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index f1ccb5fc0840..f39c7c088446 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -160,8 +160,6 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256
-#define CONFIG_FSL_DEVICE_DISABLE - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \