aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2018-02-28 20:52:00 +0100
committerMaxime Ripard <maxime.ripard@bootlin.com>2018-04-03 12:13:27 +0200
commitb56052f4ca40d0d8b29fb7bd3be4c104618e4fc8 (patch)
treeb71480d2829cb6abc373652f584347a1af46e5f8
parent6d094d535c121637775b5108f1e78e426017f757 (diff)
downloadu-boot-b56052f4ca40d0d8b29fb7bd3be4c104618e4fc8.zip
u-boot-b56052f4ca40d0d8b29fb7bd3be4c104618e4fc8.tar.gz
u-boot-b56052f4ca40d0d8b29fb7bd3be4c104618e4fc8.tar.bz2
sunxi: make NAND_SUNXI use ARCH_SUNXI as default in Kconfig
Remove NAND_SUNXI from the CHIP pro defconfig to be automatically selected depending on the state of ARCH_SUNXI. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
-rw-r--r--configs/CHIP_pro_defconfig1
-rw-r--r--drivers/mtd/nand/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index a969fc0..9235e34 100644
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -15,7 +15,6 @@ CONFIG_ENV_UBI_PART="UBI"
CONFIG_ENV_UBI_VOLUME="uboot-env"
# CONFIG_MMC is not set
CONFIG_NAND=y
-CONFIG_NAND_SUNXI=y
CONFIG_AXP_ALDO3_VOLT=3300
CONFIG_AXP_ALDO4_VOLT=3300
CONFIG_CONS_INDEX=2
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 75eefc8..cf323c5 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -95,6 +95,7 @@ config NAND_PXA3XX
config NAND_SUNXI
bool "Support for NAND on Allwinner SoCs"
+ default ARCH_SUNXI
depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUN8I
select SYS_NAND_SELF_INIT
select SYS_NAND_U_BOOT_LOCATIONS