diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-29 15:41:32 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-30 09:07:04 +0900 |
| commit | b173c19663c5bbfba1cbfa66c58ddbab60634db4 (patch) | |
| tree | 9b2aff5aab2c1ad88c44a437d09cd53f09f95062 | |
| parent | 31c86aa7fd6d655385dd7389729ac0a550abd1bc (diff) | |
| download | u-boot-b173c19663c5bbfba1cbfa66c58ddbab60634db4.tar.gz u-boot-b173c19663c5bbfba1cbfa66c58ddbab60634db4.tar.xz u-boot-b173c19663c5bbfba1cbfa66c58ddbab60634db4.zip | |
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 <yamada.masahiro@socionext.com>
| -rw-r--r-- | arch/arm/mach-uniphier/Kconfig | 1 | ||||
| -rw-r--r-- | configs/uniphier_ld4_sld8_defconfig | 1 | ||||
| -rw-r--r-- | configs/uniphier_pro4_defconfig | 1 | ||||
| -rw-r--r-- | configs/uniphier_pxs2_ld6b_defconfig | 1 |
4 files changed, 3 insertions, 1 deletions
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 |