From: Miquel Raynal Date: Wed, 28 Feb 2018 19:52:00 +0000 (+0100) Subject: sunxi: make NAND_SUNXI use ARCH_SUNXI as default in Kconfig X-Git-Tag: v2018.05-rc2~140^2~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b56052f4ca40d0d8b29fb7bd3be4c104618e4fc8;p=oweals%2Fu-boot.git 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 Acked-by: Maxime Ripard Signed-off-by: Maxime Ripard --- diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index a969fc07de..9235e34eda 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 75eefc8a2b..cf323c5348 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