From 00e270473e6d7b8610a4abac739509d1d8db22b5 Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Thu, 3 Oct 2019 19:50:12 +0200 Subject: [PATCH] mtd: ensure UBI is compiled when ENV_IS_IN_UBI is selected UBI must be enabled when the environment is in UBI. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com> --- configs/CHIP_pro_defconfig | 2 ++ env/Kconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index 02b51e3b64..040a4c5895 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -9,6 +9,7 @@ CONFIG_USE_PREBOOT=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_UBI=y CONFIG_MTDIDS_DEFAULT="nand0=sunxi-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=sunxi-nand.0:256k(spl),256k(spl-backup),2m(uboot),2m(uboot-backup),-(UBI)" CONFIG_DEFAULT_DEVICE_TREE="sun5i-gr8-chip-pro" @@ -18,6 +19,7 @@ CONFIG_ENV_UBI_VOLUME="uboot-env" CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_MMC is not set CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_UBI=y CONFIG_SYS_NAND_BLOCK_SIZE=0x40000 CONFIG_SYS_NAND_PAGE_SIZE=0x1000 CONFIG_SYS_NAND_OOBSIZE=0x100 diff --git a/env/Kconfig b/env/Kconfig index bc88c59cd5..ed12609f6a 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -366,6 +366,8 @@ config ENV_SPI_MODE config ENV_IS_IN_UBI bool "Environment in a UBI volume" depends on !CHAIN_OF_TRUST + depends on MTD_UBI + depends on CMD_UBI help Define this if you have an UBI volume that you want to use for the environment. This has the benefit of wear-leveling the environment -- 2.39.5