Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mtd: ensure UBI is compiled when ENV_IS_IN_UBI is selected

Browse source 
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>
This commit is contained in:
Miquel Raynal 2019-10-03 19:50:12 +02:00 • committed by Tom Rini
parent f344fb1540
commit 00e270473e
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/CHIP_pro_defconfig
View file

@ -9,6 +9,7 @@ CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_CMD_UBI=y
CONFIG_MTDIDS_DEFAULT="nand0=sunxi-nand.0" 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_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" 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_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_MTD_RAW_NAND=y CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_UBI=y
CONFIG_SYS_NAND_BLOCK_SIZE=0x40000 CONFIG_SYS_NAND_BLOCK_SIZE=0x40000
CONFIG_SYS_NAND_PAGE_SIZE=0x1000 CONFIG_SYS_NAND_PAGE_SIZE=0x1000
CONFIG_SYS_NAND_OOBSIZE=0x100 CONFIG_SYS_NAND_OOBSIZE=0x100

2
env/Kconfig vendored
View file

@ -366,6 +366,8 @@ config ENV_SPI_MODE
config ENV_IS_IN_UBI config ENV_IS_IN_UBI
bool "Environment in a UBI volume" bool "Environment in a UBI volume"
depends on !CHAIN_OF_TRUST depends on !CHAIN_OF_TRUST
depends on MTD_UBI
depends on CMD_UBI
help help
Define this if you have an UBI volume that you want to use for the 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 environment. This has the benefit of wear-leveling the environment