From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miquel Raynal Date: Sun, 9 Dec 2018 19:07:31 +0100 Subject: [U-Boot] [PATCH v4 09/25] mtd: ensure UBI is compiled when CMD_UBI is selected In-Reply-To: <20181209180747.24575-1-miquel.raynal@bootlin.com> References: <20181209180747.24575-1-miquel.raynal@bootlin.com> Message-ID: <20181209180747.24575-10-miquel.raynal@bootlin.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de UBI must be enabled when CMD_UBI is used, this is mandatory and will later be reflected thanks to a "depends on" in Kconfig. But first, defconfigs needs to be fixed. Signed-off-by: Miquel Raynal Reviewed-by: Boris Brezillon --- configs/am335x_baltos_defconfig | 1 + configs/am3517_evm_defconfig | 1 + configs/apf27_defconfig | 1 + configs/apx4devkit_defconfig | 1 + configs/at91sam9x5ek_dataflash_defconfig | 1 + configs/at91sam9x5ek_mmc_defconfig | 1 + configs/at91sam9x5ek_nandflash_defconfig | 1 + configs/at91sam9x5ek_spiflash_defconfig | 1 + configs/bk4r1_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/ds414_defconfig | 1 + configs/ea20_defconfig | 1 + configs/eco5pk_defconfig | 1 + configs/ethernut5_defconfig | 1 + configs/gardena-smart-gateway-mt7688-ram_defconfig | 1 + configs/gardena-smart-gateway-mt7688_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/imx6dl_icore_nand_defconfig | 1 + configs/imx6q_icore_nand_defconfig | 1 + configs/imx6q_logic_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_nand_defconfig | 1 + configs/imx6ul_geam_nand_defconfig | 1 + configs/imx6ul_isiot_nand_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2e_hs_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2g_hs_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2hk_hs_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/k2l_hs_evm_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 2 ++ configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 2 ++ configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/m53menlo_defconfig | 1 + configs/mcx_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + configs/nas220_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/omap35_logic_defconfig | 1 + configs/omap35_logic_somlv_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_logic_somlv_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omapl138_lcdk_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/pcm052_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/pfla02_defconfig | 1 + configs/platinum_picon_defconfig | 1 + configs/platinum_titanium_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/sama5d3_xplained_mmc_defconfig | 1 + configs/sama5d3_xplained_nandflash_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/titanium_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/twister_defconfig | 1 + configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_v7_defconfig | 1 + configs/uniphier_v8_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 1 + configs/vct_platinum_onenand_small_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 1 + configs/vct_platinumavc_onenand_small_defconfig | 1 + configs/vct_premium_onenand_defconfig | 1 + configs/vct_premium_onenand_small_defconfig | 1 + configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + configs/x600_defconfig | 1 + include/environment.h | 4 ++-- 116 files changed, 119 insertions(+), 2 deletions(-) diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 461de8bd5d..67551c3104 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -44,6 +44,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_OMAP24_I2C_SPEED=1000 CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_DRIVER_TI_CPSW=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 85075c5cb9..a03d8e3b85 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DM_PCA953X=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index 8f8a984b26..34e368efa7 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -41,6 +41,7 @@ CONFIG_FPGA_SPARTAN3=y CONFIG_MXC_GPIO=y CONFIG_MMC_MXC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index 7d308a5e6f..ec420f4af5 100644 --- a/configs/apx4devkit_defconfig +++ b/configs/apx4devkit_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_MII=y diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index eef9d7d701..4776ade826 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -42,6 +42,7 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index c9505343ad..8c2e2653e1 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -42,6 +42,7 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index ed305c8213..8e28d5990b 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -42,6 +42,7 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 5a44091e4c..646650b5cd 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -42,6 +42,7 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index bf2d94394b..7836a9935c 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -35,6 +35,7 @@ CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_DM_SPI_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_MTD=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 5e6b59db0c..f7114bd09d 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -29,6 +29,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325" CONFIG_ENV_IS_IN_NAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index eabd1bd037..8190010bd8 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -26,6 +26,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar" CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index fe29ec46b4..5288936aa1 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -43,6 +43,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index 0e99b9d348..576d73abda 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -35,6 +35,7 @@ CONFIG_DA8XX_GPIO=y CONFIG_SYS_I2C_DAVINCI=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SPI_FLASH=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index d5e990383f..8f02056ff1 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 1b374b4e15..9dd684e8fa 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -51,6 +51,7 @@ CONFIG_CLK_AT91=y CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y diff --git a/configs/gardena-smart-gateway-mt7688-ram_defconfig b/configs/gardena-smart-gateway-mt7688-ram_defconfig index 7bd23bb1a1..8659cfbccf 100644 --- a/configs/gardena-smart-gateway-mt7688-ram_defconfig +++ b/configs/gardena-smart-gateway-mt7688-ram_defconfig @@ -38,6 +38,7 @@ CONFIG_LED=y CONFIG_LED_BLINK=y CONFIG_LED_GPIO=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_DM_MTD=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig index 0ecffe608f..c4ee0dabaf 100644 --- a/configs/gardena-smart-gateway-mt7688_defconfig +++ b/configs/gardena-smart-gateway-mt7688_defconfig @@ -41,6 +41,7 @@ CONFIG_LED=y CONFIG_LED_BLINK=y CONFIG_LED_GPIO=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_DM_MTD=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 2dff9d68eb..e4c1ed4166 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -33,6 +33,7 @@ CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 95c21d6ea2..70bd7121fe 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -33,6 +33,7 @@ CONFIG_DM=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index deb4e11947..a3a4b6b867 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -62,6 +62,7 @@ CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_PHYLIB=y CONFIG_E1000=y CONFIG_MII=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 240933db97..f30639d425 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -62,6 +62,7 @@ CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_PHYLIB=y CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=5 diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 7bf4b6e0d2..5c581daa8e 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -64,6 +64,7 @@ CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index e846210cb4..28c6885353 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 62766fd6de..60039f9618 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect" CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 8a9f8432b9..6b4616df83 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_UBI=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index 091cf5ccc3..fffc9d410e 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 0a60726b1a..562f7ca36a 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index d507b2a0b7..78b466fd6d 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -58,6 +58,7 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 54eda990e7..b07762b1da 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -49,6 +49,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index 0a60726b1a..562f7ca36a 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index 11e514aa52..1f82974d2f 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index 80460e406a..cb61e46357 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index bece70d2d0..0e4db51197 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DA8XX_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DRIVER_TI_EMAC=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index e03cf0309b..de77c49767 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -39,6 +39,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index c13ecc5705..c69378ff99 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 5ed7d1656d..dee00ec8d4 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -39,6 +39,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 74b85864ce..b8c395d78d 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index ffc4eb51fb..c602342c53 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -39,6 +39,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index a3ad8c8ae2..bc91f2193d 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 28cbc963eb..06be026868 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -39,6 +39,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index 5998f14651..f49bc3fada 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -31,6 +31,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index a0d0fef4e8..f5fb3c9baf 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 86d2379c5f..5b9539e42d 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index 8494d4ff49..a3c1d73382 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index a3cc06bd43..74d42f7609 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -39,6 +39,8 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020 # CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index c8cc69a985..445b561b0a 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -33,6 +33,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 3f3f2cc7a9..524c225ddd 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 4e5e34c34a..f7697e0ad7 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index 75e5204ff5..0671ebad26 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -39,6 +39,8 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020 # CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 6e8214a4d8..15ff03d2b0 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 8fe3c09428..1357cd5083 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index 3f72be007b..b409a8c6b8 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index cacd9bb4dc..db148d0ce2 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index e593ad3a26..28444c2cff 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 3c95e8a767..c084980b71 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -34,6 +34,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 2a10fc19e7..ea6431d692 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 70d0742588..8ec014b466 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -34,6 +34,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index cbc7aca0a9..c8c5db6756 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -46,6 +46,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index cbe95d4e17..775264afbf 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index faddfa65a5..1b989aa798 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 0fd997bbbb..9dcaed02b4 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -37,6 +37,7 @@ CONFIG_FPGA_SPARTAN3=y CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 4946fec5ca..d313507d8f 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 3a58656a49..2b4c6568fe 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index 0789af6e7d..ea506054a1 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index 5b34a988a3..137e1c8243 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC_MXS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 5585dfd701..8b568d682a 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" CONFIG_ENV_IS_IN_NAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index cbee88022b..5d3ca20e10 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MVSATA_IDE=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index 9d2cd49094..605b17f4f3 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -40,6 +40,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index d103f14291..982ed560d1 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -40,6 +40,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 685533cec0..563b57fed4 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -54,6 +54,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 1c43772c98..976985aec2 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -46,6 +46,7 @@ CONFIG_DM_MMC=y # CONFIG_SPL_DM_MMC is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 66b1bd811b..5a671f060f 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -41,6 +41,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP36XX_PINS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index 63e076d018..77df467450 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -40,6 +40,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP36XX_PINS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 39d7ac6374..ba3ef62fb1 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -35,6 +35,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 2d2a8d2ffd..4fbf864284 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -31,6 +31,7 @@ CONFIG_DM=y CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_DM_SERIAL=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 0b54822529..e093eebd30 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -40,6 +40,7 @@ CONFIG_DM_I2C_COMPAT=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig index 4ceb9e2291..0b296d4466 100644 --- a/configs/openrd_base_defconfig +++ b/configs/openrd_base_defconfig @@ -32,6 +32,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MVSATA_IDE=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig index 8f6e6319b8..6d6e9ca205 100644 --- a/configs/openrd_client_defconfig +++ b/configs/openrd_client_defconfig @@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client" CONFIG_ENV_IS_IN_NAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVSATA_IDE=y # CONFIG_MMC_HW_PARTITIONING is not set diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig index d3111ee1f9..39c9807886 100644 --- a/configs/openrd_ultimate_defconfig +++ b/configs/openrd_ultimate_defconfig @@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate" CONFIG_ENV_IS_IN_NAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVSATA_IDE=y # CONFIG_MMC_HW_PARTITIONING is not set diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig index 2cd9e7bee7..64b748b53d 100644 --- a/configs/pcm052_defconfig +++ b/configs/pcm052_defconfig @@ -31,6 +31,7 @@ CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index c831d1210d..fb450052ad 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_DM_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index d0ae55f2e1..ae9b8969df 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -42,6 +42,7 @@ CONFIG_CMD_UBI=y CONFIG_DM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_DM_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 5a03eafbf4..540233c748 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index ad912f21cc..d46cfcd347 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -47,6 +47,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index fe08911e23..6586a7a063 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02" CONFIG_ENV_IS_IN_NAND=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_MVGBE=y CONFIG_MII=y diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 8fb6ffd43d..3ad4e6197b 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -33,6 +33,7 @@ CONFIG_BOOTCOUNT_RAM=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index a88fabf6a4..48301a230e 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -59,6 +59,7 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index e780722e3b..c16fd19948 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -56,6 +56,7 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 7176b3d85d..82bea61fef 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -32,6 +32,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" CONFIG_ENV_IS_IN_NAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 04cf5d254a..f16debbcff 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index bd8216df59..4a462fb1b0 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index 90850d9cab..d62b6eb0a4 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 601b7018b0..9c664c099f 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -47,6 +47,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 2963bae333..2fdd88b216 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 6cf12cb272..abc40d431d 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -51,6 +51,7 @@ CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 41d8af06b1..29a88ccfdc 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -52,6 +52,7 @@ CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 4e1e54060b..f495f11137 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig index 56d0a6309f..cc38efe1ca 100644 --- a/configs/titanium_defconfig +++ b/configs/titanium_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index c7e52e2f64..cad698bba0 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -38,6 +38,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index a46e1a6d99..13c5797087 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -37,6 +37,7 @@ CONFIG_LED_STATUS_CMD=y CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_CONS_INDEX=3 diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 2d92a98f5f..82437d5c2f 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 8b32e0efb4..c2c7a586b7 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 82220318a3..041f54e993 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -36,6 +36,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 776f54cc5f..3ed82523a8 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -40,6 +40,7 @@ CONFIG_MMC_UNIPHIER=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index c9c37bf108..46f10f1727 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -39,6 +39,7 @@ CONFIG_MMC_UNIPHIER=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index b781cd8992..239c14965c 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -38,6 +38,7 @@ CONFIG_MMC_SDHCI_CADENCE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index 1d3d405d8e..5cb798859c 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_ONENAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x00000000 CONFIG_SMC911X_32_BIT=y diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index 50adb73129..00fc222710 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -30,4 +30,5 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_ONENAND=y # CONFIG_NET is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index 692fae7036..f9f598b3cb 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -21,5 +21,6 @@ CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SYS_NS16550=y # CONFIG_REGEX is not set diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig index bcf39bc1ed..be06cf5aac 100644 --- a/configs/vct_platinumavc_onenand_small_defconfig +++ b/configs/vct_platinumavc_onenand_small_defconfig @@ -30,4 +30,5 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_ONENAND=y # CONFIG_NET is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SYS_NS16550=y diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig index 2e87bdf358..fea07c1916 100644 --- a/configs/vct_premium_onenand_defconfig +++ b/configs/vct_premium_onenand_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_ONENAND=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x00000000 CONFIG_SMC911X_32_BIT=y diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig index 93fd4299d2..998c5d3ef5 100644 --- a/configs/vct_premium_onenand_small_defconfig +++ b/configs/vct_premium_onenand_small_defconfig @@ -30,4 +30,5 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_ONENAND=y # CONFIG_NET is not set CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_SYS_NS16550=y diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index c8c46e9c64..fd3d59c492 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -34,6 +34,7 @@ CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index 5b7037bb9f..42b246d617 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -34,6 +34,7 @@ CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y +CONFIG_MTD_UBI=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 3797a443d6..2cc408c83b 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -48,6 +48,7 @@ CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_MICREL=y diff --git a/include/environment.h b/include/environment.h index 5e90f157e8..329f8df5d0 100644 --- a/include/environment.h +++ b/include/environment.h @@ -99,8 +99,8 @@ extern unsigned long nand_env_oob_offset; # ifndef CONFIG_ENV_SIZE # error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_UBI" # endif -# ifndef CONFIG_CMD_UBI -# error "Need to define CONFIG_CMD_UBI when using CONFIG_ENV_IS_IN_UBI" +# ifndef CONFIG_MTD_UBI +# error "Need to define CONFIG_MTD_UBI when using CONFIG_ENV_IS_IN_UBI" # endif #endif /* CONFIG_ENV_IS_IN_UBI */ -- 2.19.1