From 6d094d535c121637775b5108f1e78e426017f757 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Wed, 28 Feb 2018 20:51:59 +0100 Subject: sunxi: automatically select SPL_NAND_SUPPORT in Kconfig Make SUNXI_NAND select SPL_NAND_SUPPORT in Kconfig, this limit the number of entries to add in defconfig files when adding NAND support. For now, the only board using it is the CHIP pro. Signed-off-by: Miquel Raynal Acked-by: Maxime Ripard Signed-off-by: Maxime Ripard --- configs/CHIP_pro_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'configs/CHIP_pro_defconfig') diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index 60dcaa76db..a969fc07de 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y CONFIG_USB0_VBUS_PIN="PB10" -- cgit v1.2.1 From b56052f4ca40d0d8b29fb7bd3be4c104618e4fc8 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Wed, 28 Feb 2018 20:52:00 +0100 Subject: 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 --- configs/CHIP_pro_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'configs/CHIP_pro_defconfig') 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 -- cgit v1.2.1 From 748b5b34d3d0e67923cac5f8606b7a209e063df6 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Wed, 28 Feb 2018 20:52:01 +0100 Subject: sunxi: move the NAND parameters to Kconfig Move the NAND parameters from defconfig files to Kconfig for SUNXI architecture only. Fort now only the CHIP pro is migrated. It would have been better to convert this defconfig entry to Kconfig for all supported machines/architectures but it has been abandoned due to a fairly high amount of errors reported by the moveconfig.py tool. This is due to defines quite often being multiplications of values/other defines not correctly handled. Signed-off-by: Miquel Raynal Acked-by: Maxime Ripard Signed-off-by: Maxime Ripard --- configs/CHIP_pro_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configs/CHIP_pro_defconfig') diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index 9235e34eda..faaee831ce 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -4,7 +4,9 @@ CONFIG_MACH_SUN5I=y CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y CONFIG_USB0_VBUS_PIN="PB10" CONFIG_DEFAULT_DEVICE_TREE="sun5i-gr8-chip-pro" -CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCK_SIZE=0x40000,SYS_NAND_PAGE_SIZE=4096,SYS_NAND_OOBSIZE=256" +CONFIG_SYS_NAND_BLOCK_SIZE=0x40000 +CONFIG_SYS_NAND_OOBSIZE=0x1000 +CONFIG_SYS_NAND_OOBSIZE=0x100 CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_FLASH is not set -- cgit v1.2.1