From f344fb1540eb384ca2a82677fc2cd2728f31b225 Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Thu, 3 Oct 2019 19:50:09 +0200 Subject: [PATCH] mtd: ensure UBI is compiled when using fastmap UBI must be enabled when using fastmap, reflect this is defconfigs. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com> --- configs/am335x_igep003x_defconfig | 1 + configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/colibri-imx6ull_defconfig | 1 + configs/colibri_imx7_defconfig | 1 + configs/colibri_t20_defconfig | 1 + configs/colibri_vf_defconfig | 2 ++ configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/harmony_defconfig | 1 + configs/igep00x0_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/thuban_defconfig | 1 + 17 files changed, 18 insertions(+) diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index d50dc98c6e..103acfc29d 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -65,6 +65,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index d4d06ccb05..b7cd297a15 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -51,6 +51,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_PHYLIB=y diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig index 1603170565..759ca2428b 100644 --- a/configs/aristainetos2b_defconfig +++ b/configs/aristainetos2b_defconfig @@ -49,6 +49,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_PHYLIB=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 013a6bad16..63d74aa9ec 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -50,6 +50,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_PHYLIB=y diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index aa0ec63ae6..055f247a3b 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -64,6 +64,7 @@ CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_MXS=y CONFIG_NAND_MXS_DT=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 4e6cde4ecf..de9b827ced 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -62,6 +62,7 @@ CONFIG_DM_MTD=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS_DT=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index c5b28bc59e..02fdc1ea5b 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -45,6 +45,7 @@ CONFIG_SYS_I2C_TEGRA=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_DM_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 0bbdaf96b3..12cfc17086 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -67,6 +67,8 @@ CONFIG_MTD_RAW_NAND=y CONFIG_NAND_VF610_NFC=y CONFIG_NAND_VF610_NFC_DT=y CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y +CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index e97d1c5057..5db7f587ca 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -70,6 +70,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 6b7105153a..409b3359dc 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -71,6 +71,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index 785c8bfc8d..4429896c92 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -34,6 +34,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_DM=y CONFIG_MTD=y CONFIG_DM_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PCI=y CONFIG_DM_PCI=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 1d06cec92f..6537e74637 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -54,6 +54,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 60907a1c3f..817a492ba7 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -70,6 +70,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_MII=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index bedc523b9a..31ef0ab3c0 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -70,6 +70,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 10d010cc0c..e4af9e579a 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -71,6 +71,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_MII=y diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 19bed6be27..ded92a6d0b 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -77,6 +77,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 03f6e94756..6aaab974dd 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -70,6 +70,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_DRIVER_TI_CPSW=y -- 2.39.5