From b173c19663c5bbfba1cbfa66c58ddbab60634db4 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 29 Aug 2017 15:41:32 +0900 Subject: [PATCH] ARM: uniphier: move CONFIG_NAND to defconfig This imply was added when the option was moved by the moveconfig tool, but the intention is not clear. Move it to defconfig. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/Kconfig | 1 - configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_pro4_defconfig | 1 + configs/uniphier_pxs2_ld6b_defconfig | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 6a7e239e0d..ee22112412 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -9,7 +9,6 @@ config ARCH_UNIPHIER_32BIT select CPU_V7_HAS_NONSEC select ARMV7_NONSEC select ARCH_SUPPORT_PSCI - imply NAND choice prompt "UniPhier SoC select" diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 39f8018810..53872f6fa3 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -36,6 +36,7 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_NAND=y CONFIG_NAND_DENALI=y CONFIG_NAND_DENALI_DT=y CONFIG_SYS_NAND_DENALI_64BIT=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index f4181b1641..baec769c54 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -35,6 +35,7 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_NAND=y CONFIG_NAND_DENALI=y CONFIG_NAND_DENALI_DT=y CONFIG_SYS_NAND_DENALI_64BIT=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index a7b517ea8d..4ab56d804f 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -36,6 +36,7 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_NAND=y CONFIG_NAND_DENALI=y CONFIG_NAND_DENALI_DT=y CONFIG_SYS_NAND_DENALI_64BIT=y -- 2.39.5