[U-Boot] [RFC PATCH 7/8] Move compression and UBI from include to defconfig

Joe Hershberger joe.hershberger at ni.com
Thu May 14 06:29:57 CEST 2015


Update the boards based on tools/moveconfig.py using these settings:

RBTREE bool n y
GZIP bool y y
BZIP2 bool n y
LZMA bool n y
LZO bool n y
CMD_UBI bool n y
UBI_SILENCE_MSG bool y y
CMD_UBIFS bool n y
UBIFS_SILENCE_MSG bool y y

Signed-off-by: Joe Hershberger <joe.hershberger at ni.com>
---

 configs/MIP405T_defconfig                       | 1 +
 configs/MIP405_defconfig                        | 1 +
 configs/O2D_defconfig                           | 1 +
 configs/PIP405_defconfig                        | 1 +
 configs/PLU405_defconfig                        | 2 ++
 configs/VCMA9_defconfig                         | 4 ++++
 configs/a3m071_defconfig                        | 2 ++
 configs/a4m2k_defconfig                         | 2 ++
 configs/am335x_boneblack_defconfig              | 1 +
 configs/am335x_boneblack_vboot_defconfig        | 1 +
 configs/am335x_evm_defconfig                    | 1 +
 configs/am335x_evm_nor_defconfig                | 1 +
 configs/am335x_evm_norboot_defconfig            | 1 +
 configs/am335x_evm_spiboot_defconfig            | 1 +
 configs/am335x_evm_usbspl_defconfig             | 1 +
 configs/am335x_igep0033_defconfig               | 2 ++
 configs/apf27_defconfig                         | 2 ++
 configs/apx4devkit_defconfig                    | 2 ++
 configs/aristainetos_defconfig                  | 2 ++
 configs/at91sam9x5ek_dataflash_defconfig        | 2 ++
 configs/at91sam9x5ek_mmc_defconfig              | 2 ++
 configs/at91sam9x5ek_nandflash_defconfig        | 2 ++
 configs/at91sam9x5ek_spiflash_defconfig         | 2 ++
 configs/balloon3_defconfig                      | 1 +
 configs/bf527-ezkit_defconfig                   | 1 +
 configs/bf548-ezkit_defconfig                   | 1 +
 configs/bf561-acvilon_defconfig                 | 1 +
 configs/birdland_bav335a_defconfig              | 1 +
 configs/birdland_bav335b_defconfig              | 1 +
 configs/cam_enc_4xx_defconfig                   | 2 ++
 configs/chromebook_link_defconfig               | 2 ++
 configs/chromebox_panther_defconfig             | 2 ++
 configs/cm-bf537e_defconfig                     | 1 +
 configs/cm-bf548_defconfig                      | 2 ++
 configs/colibri_pxa270_defconfig                | 1 +
 configs/colibri_vf_defconfig                    | 2 ++
 configs/coreboot-x86_defconfig                  | 2 ++
 configs/crownbay_defconfig                      | 2 ++
 configs/davinci_dm355evm_defconfig              | 1 +
 configs/davinci_dm355leopard_defconfig          | 1 +
 configs/davinci_dm365evm_defconfig              | 1 +
 configs/dig297_defconfig                        | 2 ++
 configs/digsy_mtc_RAMBOOT_defconfig             | 1 +
 configs/digsy_mtc_defconfig                     | 1 +
 configs/digsy_mtc_rev5_RAMBOOT_defconfig        | 1 +
 configs/digsy_mtc_rev5_defconfig                | 1 +
 configs/dns325_defconfig                        | 2 ++
 configs/dockstar_defconfig                      | 2 ++
 configs/ea20_defconfig                          | 2 ++
 configs/eb_cpux9k2_defconfig                    | 2 ++
 configs/eb_cpux9k2_ram_defconfig                | 2 ++
 configs/eco5pk_defconfig                        | 2 ++
 configs/enbw_cmc_defconfig                      | 2 ++
 configs/ethernut5_defconfig                     | 2 ++
 configs/galileo_defconfig                       | 2 ++
 configs/goflexhome_defconfig                    | 2 ++
 configs/guruplug_defconfig                      | 4 ++++
 configs/gwventana_defconfig                     | 2 ++
 configs/ib62x0_defconfig                        | 4 ++++
 configs/iconnect_defconfig                      | 4 ++++
 configs/ids8313_defconfig                       | 2 ++
 configs/ipam390_defconfig                       | 2 ++
 configs/k2e_evm_defconfig                       | 2 ++
 configs/k2hk_evm_defconfig                      | 2 ++
 configs/k2l_evm_defconfig                       | 2 ++
 configs/km_kirkwood_128m16_defconfig            | 1 +
 configs/km_kirkwood_defconfig                   | 1 +
 configs/km_kirkwood_pci_defconfig               | 1 +
 configs/kmcoge4_defconfig                       | 1 +
 configs/kmcoge5ne_defconfig                     | 1 +
 configs/kmcoge5un_defconfig                     | 1 +
 configs/kmeter1_defconfig                       | 1 +
 configs/kmlion1_defconfig                       | 1 +
 configs/kmnusa_defconfig                        | 1 +
 configs/kmopti2_defconfig                       | 1 +
 configs/kmsugp1_defconfig                       | 1 +
 configs/kmsupx5_defconfig                       | 1 +
 configs/kmsuv31_defconfig                       | 1 +
 configs/kmvect1_defconfig                       | 1 +
 configs/lp8x4x_defconfig                        | 1 +
 configs/m28evk_defconfig                        | 2 ++
 configs/m53evk_defconfig                        | 2 ++
 configs/mcx_defconfig                           | 2 ++
 configs/mgcoge3ne_defconfig                     | 1 +
 configs/mgcoge3un_defconfig                     | 1 +
 configs/mgcoge_defconfig                        | 1 +
 configs/microblaze-generic_defconfig            | 1 +
 configs/minnowmax_defconfig                     | 2 ++
 configs/mt_ventoux_defconfig                    | 2 ++
 configs/mx28evk_auart_console_defconfig         | 2 ++
 configs/mx28evk_defconfig                       | 2 ++
 configs/mx28evk_nand_defconfig                  | 2 ++
 configs/mx28evk_spi_defconfig                   | 2 ++
 configs/nas220_defconfig                        | 2 ++
 configs/omap3_overo_defconfig                   | 2 ++
 configs/omap3_pandora_defconfig                 | 2 ++
 configs/omapl138_lcdk_defconfig                 | 2 ++
 configs/openrd_base_defconfig                   | 2 ++
 configs/openrd_client_defconfig                 | 2 ++
 configs/openrd_ultimate_defconfig               | 2 ++
 configs/palmld_defconfig                        | 1 +
 configs/palmtc_defconfig                        | 1 +
 configs/palmtreo680_defconfig                   | 1 +
 configs/platinum_picon_defconfig                | 2 ++
 configs/platinum_titanium_defconfig             | 2 ++
 configs/pogo_e02_defconfig                      | 2 ++
 configs/portl2_defconfig                        | 1 +
 configs/pxm2_defconfig                          | 2 ++
 configs/qemu_mips64_defconfig                   | 1 +
 configs/qemu_mips64el_defconfig                 | 1 +
 configs/qemu_mips_defconfig                     | 1 +
 configs/qemu_mipsel_defconfig                   | 1 +
 configs/qong_defconfig                          | 2 ++
 configs/rut_defconfig                           | 2 ++
 configs/sama5d3_xplained_mmc_defconfig          | 2 ++
 configs/sama5d3_xplained_nandflash_defconfig    | 2 ++
 configs/sandbox_defconfig                       | 3 +++
 configs/sheevaplug_defconfig                    | 4 ++++
 configs/smdk2410_defconfig                      | 4 ++++
 configs/suvd3_defconfig                         | 1 +
 configs/titanium_defconfig                      | 2 ++
 configs/tricorder_defconfig                     | 2 ++
 configs/tricorder_flash_defconfig               | 2 ++
 configs/tuge1_defconfig                         | 1 +
 configs/tuxx1_defconfig                         | 1 +
 configs/twister_defconfig                       | 2 ++
 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                      | 2 ++
 configs/vf610twr_nand_defconfig                 | 2 ++
 configs/vpac270_nor_128_defconfig               | 1 +
 configs/vpac270_nor_256_defconfig               | 1 +
 configs/vpac270_ond_256_defconfig               | 1 +
 configs/x600_defconfig                          | 2 ++
 configs/zipitz2_defconfig                       | 1 +
 configs/zmx25_defconfig                         | 1 +
 include/config_cmd_all.h                        | 2 --
 include/config_defaults.h                       | 1 -
 include/configs/M54418TWR.h                     | 2 --
 include/configs/MIP405.h                        | 1 -
 include/configs/PIP405.h                        | 1 -
 include/configs/PLU405.h                        | 3 ---
 include/configs/VCMA9.h                         | 7 -------
 include/configs/a3m071.h                        | 4 ----
 include/configs/am335x_evm.h                    | 1 -
 include/configs/am335x_igep0033.h               | 4 ----
 include/configs/apf27.h                         | 4 ----
 include/configs/apx4devkit.h                    | 4 ----
 include/configs/aristainetos.h                  | 4 ----
 include/configs/at91sam9x5ek.h                  | 4 ----
 include/configs/balloon3.h                      | 1 -
 include/configs/bav335x.h                       | 1 -
 include/configs/bct-brettl2.h                   | 1 -
 include/configs/bf506f-ezkit.h                  | 1 -
 include/configs/bfin_adi_common.h               | 1 -
 include/configs/cam_enc_4xx.h                   | 4 ----
 include/configs/colibri_pxa270.h                | 1 -
 include/configs/colibri_vf.h                    | 4 ----
 include/configs/da850evm.h                      | 4 ----
 include/configs/davinci_dm355evm.h              | 2 --
 include/configs/davinci_dm355leopard.h          | 2 --
 include/configs/davinci_dm365evm.h              | 2 --
 include/configs/dig297.h                        | 4 ----
 include/configs/digsy_mtc.h                     | 1 -
 include/configs/dockstar.h                      | 4 ----
 include/configs/ea20.h                          | 4 ----
 include/configs/eb_cpux9k2.h                    | 4 ----
 include/configs/enbw_cmc.h                      | 4 ----
 include/configs/ethernut5.h                     | 4 ----
 include/configs/guruplug.h                      | 6 ------
 include/configs/gw_ventana.h                    | 4 ----
 include/configs/ib62x0.h                        | 6 ------
 include/configs/iconnect.h                      | 6 ------
 include/configs/ids8313.h                       | 4 ----
 include/configs/ipam390.h                       | 4 ----
 include/configs/km/keymile-common.h             | 2 --
 include/configs/ks2_evm.h                       | 4 ----
 include/configs/lacie_kw.h                      | 1 -
 include/configs/lp8x4x.h                        | 1 -
 include/configs/m28evk.h                        | 4 ----
 include/configs/m53evk.h                        | 4 ----
 include/configs/mcx.h                           | 4 ----
 include/configs/microblaze-generic.h            | 7 -------
 include/configs/mv-common.h                     | 4 ----
 include/configs/mv88f6281gtw_ge.h               | 3 ---
 include/configs/mx28evk.h                       | 4 ----
 include/configs/nas220.h                        | 4 ----
 include/configs/nokia_rx51.h                    | 4 ----
 include/configs/omap3_overo.h                   | 4 ----
 include/configs/omap3_pandora.h                 | 4 ----
 include/configs/omapl138_lcdk.h                 | 4 ----
 include/configs/palmld.h                        | 1 -
 include/configs/palmtc.h                        | 1 -
 include/configs/palmtreo680.h                   | 1 -
 include/configs/platinum.h                      | 4 ----
 include/configs/pogo_e02.h                      | 4 ----
 include/configs/pxm2.h                          | 4 ----
 include/configs/qemu-mips.h                     | 1 -
 include/configs/qemu-mips64.h                   | 1 -
 include/configs/qong.h                          | 4 ----
 include/configs/rut.h                           | 4 ----
 include/configs/sama5d3_xplained.h              | 4 ----
 include/configs/sandbox.h                       | 3 ---
 include/configs/sheevaplug.h                    | 6 ------
 include/configs/smdk2410.h                      | 6 ------
 include/configs/tam3517-common.h                | 4 ----
 include/configs/titanium.h                      | 4 ----
 include/configs/tricorder.h                     | 4 ----
 include/configs/vct.h                           | 2 --
 include/configs/vf610twr.h                      | 4 ----
 include/configs/vpac270.h                       | 1 -
 include/configs/wireless_space.h                | 1 -
 include/configs/x600.h                          | 4 ----
 include/configs/x86-common.h                    | 2 --
 include/configs/zipitz2.h                       | 1 -
 include/configs/zmx25.h                         | 1 -
 220 files changed, 226 insertions(+), 251 deletions(-)

diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 8777200..80359ef 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
 CONFIG_SYS_EXTRA_OPTIONS="MIP405T"
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index c8d1494..7fccedf 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/O2D_defconfig b/configs/O2D_defconfig
index af665a4..c07cc0e 100644
--- a/configs/O2D_defconfig
+++ b/configs/O2D_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2D=y
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 1a62e08..e22e9bd 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_PIP405=y
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig
index 129475d..3dda1fb 100644
--- a/configs/PLU405_defconfig
+++ b/configs/PLU405_defconfig
@@ -2,3 +2,5 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_PLU405=y
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
+CONFIG_LZO=y
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index a6bbb38..dc4ed94 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -1,3 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VCMA9=y
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 6797017..e5d3a5f 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -3,3 +3,5 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_A3M071=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index e71d755..a11951f 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_A3M071=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A4M2K"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index a514075..f6c465f 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_LZO=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 31b7753..aaf94ce 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -10,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_OF_CONTROL=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 144e993..f0554f8 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index b94d3e1..1f91eb4 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 6ba8bf3..c9dbe99 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_AM335X_EVM=y
 CONFIG_NOR=y
 CONFIG_NOR_BOOT=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 7dbbead..f357896 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index 790b43f..b1e3c32 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_LZO=y
diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
index 62a62b4..12823a7 100644
--- a/configs/am335x_igep0033_defconfig
+++ b/configs/am335x_igep0033_defconfig
@@ -4,3 +4,5 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_RBTREE=y
+CONFIG_LZO=y
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index ea9b4a6..5f74558 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_APF27=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig
index 0585b11..43977de 100644
--- a/configs/apx4devkit_defconfig
+++ b/configs/apx4devkit_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_APX4DEVKIT=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 16df93e..71bc3bc 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_ARISTAINETOS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index 20bf18b..4e42f01 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index 14ddfc0..9d165ab 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
 CONFIG_ENV_IS_IN_FAT=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index cff1058..b4a5ab9 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index a4e0eba..dbcb86d 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/balloon3_defconfig b/configs/balloon3_defconfig
index 4e23ee7..9b37994 100644
--- a/configs/balloon3_defconfig
+++ b/configs/balloon3_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BALLOON3=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
index 28593e4..20212e6 100644
--- a/configs/bf527-ezkit_defconfig
+++ b/configs/bf527-ezkit_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_EZKIT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
+CONFIG_LZMA=y
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index 1075956..eb6199a 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -1,4 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF548_EZKIT=y
 CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index ea4dd08..93a9046 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF561_ACVILON=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
+CONFIG_LZO=y
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 43a4206..2eb026e 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=1
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_LZO=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index 7206e8e..be7a6ba 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=2
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_LZO=y
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index 73060e5..23d6a38 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CAM_ENC_4XX=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 16dcbe8..2c04d06 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -9,3 +9,5 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
 CONFIG_VIDEO_VESA=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 9893451..d34286b 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -9,3 +9,5 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
 CONFIG_VIDEO_VESA=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index cfd1575..5d04223 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -1,4 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF537E=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index 7ec8301..ef8b387 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -1,4 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF548=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index ade5ede..3627a1b 100644
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_PXA270=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 3a0ef63..c3ea628 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 4a6856a..1aa5726 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_COREBOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index c1a3e57..c694c80 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -5,3 +5,5 @@ CONFIG_TARGET_CROWNBAY=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_OF_CONTROL=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index 79d71fe..b1537fd 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355EVM=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 0888e97..6e7182a 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index 7479089..88e55d8 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM365EVM=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
index 1b4a3b1..2f6c6a8 100644
--- a/configs/dig297_defconfig
+++ b/configs/dig297_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_DIG297=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index 86a25b0..7ebd30b 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index cad7a40..964bf36 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index 70c8d48..4e02885 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000,DIGSY_REV5"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index 8edcfdf..44f91c9 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_SYS_EXTRA_OPTIONS="DIGSY_REV5"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 62294b9..462af29 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DNS325=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 44911fd..8ea05f4 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DOCKSTAR=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index bb3def5..4c0f21d 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig
index c5b3f76..43b6e19 100644
--- a/configs/eb_cpux9k2_defconfig
+++ b/configs/eb_cpux9k2_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_EB_CPUX9K2=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/eb_cpux9k2_ram_defconfig b/configs/eb_cpux9k2_ram_defconfig
index 9a17e68..cbfdce3 100644
--- a/configs/eb_cpux9k2_ram_defconfig
+++ b/configs/eb_cpux9k2_ram_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_EB_CPUX9K2=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index 375d210..f1b4a06 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_ECO5PK=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/enbw_cmc_defconfig b/configs/enbw_cmc_defconfig
index e446cad..d9559fb 100644
--- a/configs/enbw_cmc_defconfig
+++ b/configs/enbw_cmc_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_ENBW_CMC=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index bb6a835..9c1b5fb 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_ETHERNUT5=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 94beb45..1fdebef 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -7,3 +7,5 @@ CONFIG_TARGET_GALILEO=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_OF_CONTROL=y
 CONFIG_ETH_DESIGNWARE=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 9eec07d..aef64a7 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GOFLEXHOME=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 656316a..118248d 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GURUPLUG=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 6858c6c..7de8c35 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_MALLOC_F=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 4f5a1db..402b44b 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_IB62X0=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 4f13862..4b29dab 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_ICONNECT=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index c7d7a02..4c198cf 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -5,3 +5,5 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index bcf0be7..131509c 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_IPAM390=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index fba321b..8cb5bda 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2E_EVM=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 1308beb..060ab21 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2HK_EVM=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 679e3a8..11d2e4a 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2L_EVM=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index b0277e7..cce2b90 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 2c1fa1b..0693ae7 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 70b5d58..cc6763f 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index a63cf3d..f1b18e63 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index b949b1c..2c1e0a8 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_KM8360=y
 CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 51f4020..316671f 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 9699d49..87b9653 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_KM8360=y
 CONFIG_SYS_EXTRA_OPTIONS="KMETER1"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index cd1b32d..3ec83d3 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 09060de..35bfcbf 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index b90aae6..0c9d7c0 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 510a5a5..3ae4d96 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index ff3c5ff..f8b4df9 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index ab01012..0fc2ce2 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 34b9bc3..ecd663b 100644
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_SYS_EXTRA_OPTIONS="KMVECT1"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/lp8x4x_defconfig b/configs/lp8x4x_defconfig
index 6383f44..c262f67 100644
--- a/configs/lp8x4x_defconfig
+++ b/configs/lp8x4x_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LP8X4X=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 5c98214..7e387ae 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_M28EVK=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
 CONFIG_REGEX=y
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index a6a497b..07db5a3 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -3,4 +3,6 @@ CONFIG_TARGET_M53EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
 CONFIG_REGEX=y
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index dca4f20..b3e0629 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_MCX=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index 2237ffd..86323ba 100644
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC8260=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MGCOGE3NE"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 447d085..535d01a 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index 8d060d6..f2e187b 100644
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC8260=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MGCOGE"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 0d5ac16..55b7b1b 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -3,5 +3,6 @@ CONFIG_TARGET_MICROBLAZE_GENERIC=y
 CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index ad794aa..61188cc 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -10,3 +10,5 @@ CONFIG_GENERATE_SFI_TABLE=y
 CONFIG_CMD_CPU=y
 CONFIG_OF_CONTROL=y
 CONFIG_CPU=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 1cea25c..d897f90 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_MT_VENTOUX=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 848e301..d0bca2a 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 11dc0e5..1f2e3c4 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 2d9a42c..cba3d1d 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 403a3d8..a22c57f 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index a7a671b..4b17a82 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NAS220=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index 6b0b357..28443db 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_OVERO=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index 083a1a8..3387fdd 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_PANDORA=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 6641917..63233b5 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_OMAPL138_LCDK=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 9e1c0fb..748563f 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -3,3 +3,5 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 03444d0..0f97dde 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -3,3 +3,5 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 70963b1..fea6ccc 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -3,3 +3,5 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/palmld_defconfig b/configs/palmld_defconfig
index 8f1581e..b4b1a48 100644
--- a/configs/palmld_defconfig
+++ b/configs/palmld_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PALMLD=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/palmtc_defconfig b/configs/palmtc_defconfig
index 2b6c12a..3777add 100644
--- a/configs/palmtc_defconfig
+++ b/configs/palmtc_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PALMTC=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/palmtreo680_defconfig b/configs/palmtreo680_defconfig
index f30d2b7..318c4e2 100644
--- a/configs/palmtreo680_defconfig
+++ b/configs/palmtreo680_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PALMTREO680=y
 CONFIG_SPL=y
+CONFIG_LZMA=y
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index f607574..256777a 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_PICON=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 6561aed..36fca62 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index aa62db7..abb6f5b 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_POGO_E02=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 51c2588..b0305e8 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 585f1f75..a41bfd1 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_PXM2=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig
index 36da677..8bae13a 100644
--- a/configs/qemu_mips64_defconfig
+++ b/configs/qemu_mips64_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_CPU_MIPS64_R1=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig
index ccbb4cf..6c54c45 100644
--- a/configs/qemu_mips64el_defconfig
+++ b/configs/qemu_mips64el_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_CPU_MIPS64_R1=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig
index 774e27a..7285cbb 100644
--- a/configs/qemu_mips_defconfig
+++ b/configs/qemu_mips_defconfig
@@ -1,3 +1,4 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig
index f6eb7a2..f5c9a05 100644
--- a/configs/qemu_mipsel_defconfig
+++ b/configs/qemu_mipsel_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qong_defconfig b/configs/qong_defconfig
index 4be1378..4efcd59 100644
--- a/configs/qong_defconfig
+++ b/configs/qong_defconfig
@@ -1,3 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_QONG=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 5b678bf..aa48d76 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_RUT=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index cfef85b..27b39b6 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_SAMA5D3_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
 CONFIG_ENV_IS_IN_FAT=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index a829fa5..13edd67 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_SAMA5D3_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index cc309c8..0972b4f 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -27,4 +27,7 @@ CONFIG_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_RTC=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
+CONFIG_LZO=y
 CONFIG_CMD_UT_TIME=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index b9ff68d..6646bdb 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_SHEEVAPLUG=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index 86eb7fd..71d171e 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -1,3 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SMDK2410=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index d36f7da..fe80714 100644
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_SYS_EXTRA_OPTIONS="SUVD3"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
index 1655ffe..19bed54 100644
--- a/configs/titanium_defconfig
+++ b/configs/titanium_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_TITANIUM=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index 1c202c7..0c10cff 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig
index c00bffe..7f56e89 100644
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 0b925dc..734581c 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="TUGE1"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 6ee66f2..2a07e51 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="TUXX1"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index b07abcd..3ff0a35 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TWISTER=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index 317b4ca..078866f 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 387f1c1..75c483a 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index 81b2507..fdbf13b 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_ONENAND=y
 CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 1dc275d..8caf2a8 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index 5e7b95e..ed74502 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index 97c292f..3e46238 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_UBI=y
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index d4f82f3..7765b33 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_VF610TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_MMC"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index cfbfa4b..c669064 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_VF610TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_NAND"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/vpac270_nor_128_defconfig b/configs/vpac270_nor_128_defconfig
index bb8c3d8..78f7a4d 100644
--- a/configs/vpac270_nor_128_defconfig
+++ b/configs/vpac270_nor_128_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_VPAC270=y
 CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_128M"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/vpac270_nor_256_defconfig b/configs/vpac270_nor_256_defconfig
index e1c040d..cfe4822 100644
--- a/configs/vpac270_nor_256_defconfig
+++ b/configs/vpac270_nor_256_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_VPAC270=y
 CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_256M"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig
index 5569c8f..5209bab 100644
--- a/configs/vpac270_ond_256_defconfig
+++ b/configs/vpac270_ond_256_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M"
 CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_LZMA=y
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index d530eb3..02a0905 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -4,4 +4,6 @@ CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_SPL=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 6446159..8d4336b 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ZIPITZ2=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 014a01a..61111d0 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ZMX25=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZO=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 2c2a05b..6d9f839 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -89,8 +89,6 @@
 #define CONFIG_CMD_SOURCE	/* "source" command support	*/
 #define CONFIG_CMD_SPI		/* SPI utility			*/
 #define CONFIG_CMD_TERMINAL	/* built-in Serial Terminal	*/
-#define CONFIG_CMD_UBI		/* UBI Support			*/
-#define CONFIG_CMD_UBIFS	/* UBIFS Support		*/
 #define CONFIG_CMD_UNIVERSE	/* Tundra Universe Support	*/
 #define CONFIG_CMD_UNZIP	/* unzip from memory to memory	*/
 #define CONFIG_CMD_USB		/* USB Support			*/
diff --git a/include/config_defaults.h b/include/config_defaults.h
index ad08c1d..ab1e593 100644
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -16,7 +16,6 @@
 #define CONFIG_BOOTM_RTEMS 1
 #define CONFIG_BOOTM_VXWORKS 1
 
-#define CONFIG_GZIP 1
 #define CONFIG_ZLIB 1
 #define CONFIG_PARTITIONS 1
 
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 5bc49e1..d564f4a 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -48,7 +48,6 @@
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_UBI
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
@@ -377,7 +376,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE	/* needed for mtdparts command */
 #define CONFIG_MTD_PARTITIONS	/* mtdparts and UBI support */
-#define CONFIG_RBTREE
 #define MTDIDS_DEFAULT		"nand0=NAND"
 #define MTDPARTS_DEFAULT	"mtdparts=NAND:1m(u-boot),"	\
 					"-(ubi)"
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index e43f8ac..666b02e 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -401,7 +401,6 @@
 /************************************************************
  * support BZIP2 compression
  ************************************************************/
-#define CONFIG_BZIP2		1
 
 /************************************************************
  * Ident
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index c263062..5595857 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -358,7 +358,6 @@
 /************************************************************
  * support BZIP2 compression
  ************************************************************/
-#define CONFIG_BZIP2		1
 
 /************************************************************
  * Ident
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index e790a1a..87052c7 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -405,11 +405,8 @@
 /*
  * UBI
  */
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index a464143..f3be290 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -161,9 +161,6 @@
 /* we configure PWM Timer 4 to 1ms 1000Hz  */
 
 /* support additional compression methods */
-#define CONFIG_BZIP2
-#define CONFIG_LZO
-#define CONFIG_LZMA
 
 /* Ident */
 /*#define VERSION_TAG "released"*/
@@ -213,15 +210,11 @@
 
 /* File system */
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_JFFS2
 #define CONFIG_YAFFS2
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000 - \
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 02e9da2..7c22c26 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -81,11 +81,7 @@
 						"5376k(data),"	\
 						"8M(install)"
 
-#define CONFIG_LZO			/* needed for UBI */
-#define CONFIG_RBTREE			/* needed for UBI */
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_FIT
 
 /*
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 7501f0e..a1e7714 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -23,7 +23,6 @@
 # define CONFIG_FIT
 #endif
 # define CONFIG_TIMESTAMP
-# define CONFIG_LZO
 #endif
 
 #define CONFIG_SYS_BOOTM_LEN		(16 << 20)
diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h
index dd529bb..7f9285b 100644
--- a/include/configs/am335x_igep0033.h
+++ b/include/configs/am335x_igep0033.h
@@ -28,8 +28,6 @@
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 
 /* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
@@ -110,8 +108,6 @@
 
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 
 #define MTDIDS_DEFAULT			"nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:512k(spl),"\
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index ded388c..10f1916 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -87,8 +87,6 @@
 #define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_PING		/* ping support			*/
 #define CONFIG_CMD_SETEXPR	/* setexpr support		*/
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 
 /*
  * Memory configurations
@@ -279,8 +277,6 @@
 /*
  * UBIFS
  */
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 
 /*
  * Ethernet (on SOC imx FEC)
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index 42f572a..223ae2f 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -70,11 +70,7 @@
 
 /* UBI and NAND partitioning */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define MTDIDS_DEFAULT			"nand0=gpmi-nand"
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 8c43700..a1789c7 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -307,10 +307,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 
 #define CONFIG_MTD_UBI_FASTMAP
 #define CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT	1
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index ca0845c..c93665c 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -126,10 +126,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #endif
 
 /* MMC */
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index bf3f94c..4f56e70 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -33,7 +33,6 @@
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
 #define	CONFIG_SYS_TEXT_BASE		0x0
-#define	CONFIG_LZMA			/* LZMA compression support */
 
 /*
  * Serial Console Configuration
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 3932bea..70daaf5 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -22,7 +22,6 @@
 #ifndef CONFIG_SPL_BUILD
 # define CONFIG_FIT
 # define CONFIG_TIMESTAMP
-# define CONFIG_LZO
 # ifdef CONFIG_ENABLE_VBOOT
 #  define CONFIG_FIT_SIGNATURE
 #  define CONFIG_RSA
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 6e72aeb..434eaf1 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -144,7 +144,6 @@
 
 /* disable unnecessary features */
 #undef CONFIG_BOOTM_RTEMS
-#undef CONFIG_BZIP2
 #undef CONFIG_KALLSYMS
 
 #endif
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 6a6f964..6900329 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -97,7 +97,6 @@
 #define CONFIG_BFIN_SERIAL
 
 #define CONFIG_CMD_MEMORY
-#undef CONFIG_GZIP
 #undef CONFIG_ZLIB
 #undef CONFIG_BOOTM_RTEMS
 #undef CONFIG_BOOTM_LINUX
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 143d3dd..5edcec8 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -317,7 +317,6 @@
 # define CONFIG_BOARD_SIZE_LIMIT $$(( 256 * 1024 ))
 #endif
 #define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */
-#define CONFIG_LZMA
 #define CONFIG_MONITOR_IS_IN_RAM
 #ifdef CONFIG_HW_WATCHDOG
 # define CONFIG_BFIN_WATCHDOG
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index a502c90..b345247 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -120,10 +120,6 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #endif
 
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 3b31363..0c66073 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -38,7 +38,6 @@
 #define	CONFIG_BOOTDELAY		2	/* Autoboot delay */
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
-#define	CONFIG_LZMA			/* LZMA compression support */
 #define	CONFIG_OF_LIBFDT
 
 /*
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 414600a..2f41371 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -82,13 +82,9 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_UBI
 #define CONFIG_MTD_UBI_FASTMAP
-#define CONFIG_CMD_UBIFS	/* increases size by almost 60 KB */
 
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 07f4145..1a59ce5 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -317,10 +317,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 4bf21ca..e16d308 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -98,8 +98,6 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
 #endif
 
 #ifdef CONFIG_USB_DAVINCI
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index 34cee0a..488a874 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -76,8 +76,6 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
 #endif
 
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 565082e..cb064e7 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -141,8 +141,6 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
 #endif
 
 #define CONFIG_CRC32_VERIFY
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index e029580..05d35d8 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -98,16 +98,12 @@
 #define CONFIG_DOS_PARTITION
 
 /* library portions to compile in */
-#define CONFIG_RBTREE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
 
 /* commands to include */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_FAT		/* FAT support			*/
-#define CONFIG_CMD_UBI		/* UBI Support			*/
-#define CONFIG_CMD_UBIFS	/* UBIFS Support		*/
 #define CONFIG_CMD_MTDPARTS	/* Enable MTD parts commands    */
 #define CONFIG_MTD_DEVICE	/* needed for mtdparts commands */
 #define MTDIDS_DEFAULT		"nand0=omap2-nand.0"
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 54d20a4..9f49ae8 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -69,7 +69,6 @@
  *  Partitions
  */
 #define CONFIG_DOS_PARTITION
-#define CONFIG_BZIP2
 
 /*
  * Video
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index cba4e1b..ba328c9 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -97,12 +97,8 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 
 #endif /* _CONFIG_DOCKSTAR_H */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 31ec1f1..bbf907e 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -177,10 +177,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 
 #define CONFIG_NAND_DAVINCI
 #define	CONFIG_SYS_NAND_PAGE_2K
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 01f9ae6..eb1781f 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -125,9 +125,7 @@
 #define CONFIG_I2C_CMD_TREE
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_UBIFS
 
 #define CONFIG_SYS_LONGHELP
 
@@ -138,8 +136,6 @@
 #define CONFIG_FLASH_CFI_MTD
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 
 #define MTDIDS_DEFAULT		"nor0=physmap-flash.0,nand0=atmel_nand"
 #define MTDPARTS_DEFAULT	"mtdparts="				\
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index a058827..a76c7ec 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -273,10 +273,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #endif
 
 #if !defined(CONFIG_USE_NAND) && \
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 5feec17..9026913 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -131,8 +131,6 @@
 #define CONFIG_CMD_SETEXPR
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SNTP
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_USB
 #endif
@@ -237,8 +235,6 @@
 	defined(CONFIG_CMD_USB) || defined(CONFIG_MMC)
 #define CONFIG_DOS_PARTITION
 #endif
-#define CONFIG_LZO
-#define CONFIG_RBTREE
 
 /* Boot command */
 #define CONFIG_BOOTDELAY	3
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 5395a22..ff4364e 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -28,9 +28,6 @@
 /*
  * Compression configuration
  */
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Enable device tree support
@@ -130,9 +127,6 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index aead45b..f278413 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -116,7 +116,6 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBIFS
 #define CONFIG_DOS_PARTITION
 
 /*
@@ -167,9 +166,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_GSC
 #define CONFIG_CMD_EECONFIG      /* Gateworks EEPROM config cmd */
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_CMD_FUSE          /* eFUSE read/write support */
 #ifdef CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index b71b4ea..3a88d41 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -36,9 +36,6 @@
 /*
  * Compression configuration
  */
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Commands configuration
@@ -135,9 +132,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 0310927..ca489d1 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -31,9 +31,6 @@
 /*
  * Compression configuration
  */
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Commands configuration
@@ -104,9 +101,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 50be7fb..d505133 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -559,10 +559,6 @@
 
 /* UBI Support */
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_PARTITIONS
 
 /* bootcount support */
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 8b1f2fe..4226ead 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -281,10 +281,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 
 #define MTDIDS_NAME_STR		"davinci_nand.0"
 #define MTDIDS_DEFAULT		"nand0=" MTDIDS_NAME_STR
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 517f46a..ddf2f62 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -76,8 +76,6 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* UBI Support for all Keymile boards */
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_CONCAT
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index ecebd1f..54fadc3 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -187,8 +187,6 @@
 #define CONFIG_ENV_OFFSET			0x100000
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define MTDIDS_DEFAULT			"nand0=davinci_nand.0"
 #define MTDPARTS_DEFAULT		"mtdparts=davinci_nand.0:" \
 					"1024k(bootloader)ro,512k(params)ro," \
@@ -217,8 +215,6 @@
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_USB
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 87c23fb..915aadf 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -91,7 +91,6 @@
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */
-#undef CONFIG_RBTREE
 #undef CONFIG_ENV_SPI_MAX_HZ
 #undef CONFIG_SYS_IDE_MAXBUS
 #undef CONFIG_SYS_IDE_MAXDEVICE
diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h
index 962a409..21c4b55 100644
--- a/include/configs/lp8x4x.h
+++ b/include/configs/lp8x4x.h
@@ -30,7 +30,6 @@
 #define	CONFIG_BOOTDELAY		2	/* Autoboot delay */
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
-#define	CONFIG_LZMA			/* LZMA compression support */
 #define	CONFIG_OF_LIBFDT
 
 /*
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index ea2740c..0dcb5a0 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -68,11 +68,7 @@
 #define CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
 
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define MTDIDS_DEFAULT			"nand0=gpmi-nand"
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 496a425..70936f4 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -133,11 +133,7 @@
 #define CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
 
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define MTDIDS_DEFAULT			"nand0=mxc_nand"
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index c8bd6c4..0b4cb28 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -128,10 +128,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e91831d..daffd5f 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -273,8 +273,6 @@
 # define CONFIG_CMD_FLASH
 # define CONFIG_CMD_IMLS
 # define CONFIG_CMD_JFFS2
-# define CONFIG_CMD_UBI
-# undef CONFIG_CMD_UBIFS
 
 # if !defined(RAMENV)
 #  define CONFIG_CMD_SAVEENV
@@ -293,8 +291,6 @@
 # undef CONFIG_CMD_IMLS
 # undef CONFIG_CMD_FLASH
 # undef CONFIG_CMD_JFFS2
-# undef CONFIG_CMD_UBI
-# undef CONFIG_CMD_UBIFS
 #endif
 #endif
 
@@ -303,13 +299,10 @@
 #endif
 
 #if defined(CONFIG_CMD_UBIFS)
-# define CONFIG_CMD_UBI
-# define CONFIG_LZO
 #endif
 
 #if defined(CONFIG_CMD_UBI)
 # define CONFIG_MTD_PARTITIONS
-# define CONFIG_RBTREE
 #endif
 
 #if defined(CONFIG_MTD_PARTITIONS)
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 51436da..e3fe6f2 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -143,13 +143,9 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 #endif
 
 #endif /* _MV_COMMON_H */
diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h
index 6be2d9d..96d9399 100644
--- a/include/configs/mv88f6281gtw_ge.h
+++ b/include/configs/mv88f6281gtw_ge.h
@@ -45,9 +45,6 @@
 #undef	CONFIG_CMD_EXT2
 #undef	CONFIG_CMD_JFFS2
 #undef	CONFIG_CMD_FAT
-#undef	CONFIG_CMD_UBI
-#undef	CONFIG_CMD_UBIFS
-#undef	CONFIG_RBTREE
 
 /*
  *  Environment variables configurations
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 9daa0bf..956c4ef 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -85,11 +85,7 @@
 
 /* UBI and NAND partitioning */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define MTDIDS_DEFAULT			"nand0=gpmi-nand"
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 1ae7f14..01e1e58 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -126,13 +126,9 @@
 #define CONFIG_CMD_JFFS2
 #define CONFIG_JFFS2_NAND
 #define CONFIG_JFFS2_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 
 /*
  * SATA
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a6a3cf0..bd1e6d4 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -146,8 +146,6 @@
 #define CONFIG_CMD_MTDPARTS		/* mtd parts support */
 
 #ifdef UBIFS_SUPPORT
-#define CONFIG_CMD_UBI			/* UBI Support */
-#define CONFIG_CMD_UBIFS		/* UBIFS Support */
 #endif
 
 #endif
@@ -229,8 +227,6 @@
 #define CONFIG_MTD_PARTITIONS
 
 #ifdef UBIFS_SUPPORT
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #endif
 
 #define MTDIDS_DEFAULT			"onenand0=onenand"
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index ebea0dd..9403c1b 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -63,11 +63,7 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #ifdef CONFIG_NAND
-#define CONFIG_CMD_UBI		/* UBI-formated MTD partition support */
-#define CONFIG_CMD_UBIFS	/* Read-only UBI volume operations */
 
-#define CONFIG_RBTREE		/* required by CONFIG_CMD_UBI */
-#define CONFIG_LZO		/* required by CONFIG_CMD_UBIFS */
 
 #define CONFIG_MTD_PARTITIONS	/* required for UBI partition support */
 
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 56bf57d..f01b1ef 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -78,11 +78,7 @@
 #define CONFIG_SYS_NAND_OOBSIZE		64
 
 #ifdef CONFIG_NAND
-#define CONFIG_CMD_UBI		/* UBI-formated MTD partition support */
-#define CONFIG_CMD_UBIFS	/* Read-only UBI volume operations */
 
-#define CONFIG_RBTREE		/* required by CONFIG_CMD_UBI */
-#define CONFIG_LZO		/* required by CONFIG_CMD_UBIFS */
 
 #define CONFIG_MTD_PARTITIONS	/* required for UBI partition support */
 
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 9bbfbc1..8ff9ec9 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -253,10 +253,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index 452fa59..b64ba57 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -37,7 +37,6 @@
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
 
-#define	CONFIG_LZMA			/* LZMA compression support */
 
 /*
  * Serial Console Configuration
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index 7be365a..e011597 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -40,7 +40,6 @@
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
 
-#define	CONFIG_LZMA			/* LZMA compression support */
 
 /*
  * Serial Console Configuration
diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
index 40edce3..a2840de 100644
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_SYS_MALLOC_LEN           (4096*1024)
 
-#define CONFIG_LZMA
 
 /*
  * Serial Console Configuration
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index ca7d649..6d08c24 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -42,8 +42,6 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_TIME
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_USB
 
 /*
@@ -200,10 +198,8 @@
 #define CONFIG_SYS_LOAD_ADDR			CONFIG_LOADADDR
 
 /* MTD/UBI/UBIFS config */
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
 
 #if (CONFIG_SYS_NAND_MAX_CHIPS == 1)
 #define MTDIDS_DEFAULT		"nand0=gpmi-nand"
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 8e6d9b5..193dce0 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -93,12 +93,8 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 
 #endif /* _CONFIG_POGO_E02_H */
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 946b2c8..33dc7c9 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -53,10 +53,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #endif
 
 /* Watchdog */
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index eaca954..6509344 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -143,7 +143,6 @@
 
 #define MEM_SIZE		128
 
-#define CONFIG_LZMA
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 847d80b..08413e7 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -145,7 +145,6 @@
 
 #define MEM_SIZE		128
 
-#define CONFIG_LZMA
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 847c688..05b37ba 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -258,12 +258,8 @@ extern int qong_nand_rdy(void *chip);
  * Filesystem
  */
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
 #define CONFIG_FLASH_CFI_MTD
 #define MTDIDS_DEFAULT		"nor0=physmap-flash.0,"		\
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 0067ea4..668dd4d 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -50,10 +50,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #endif
 
 /* Watchdog */
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index d0cfd4c..78d3d8f 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -65,10 +65,6 @@
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #endif
 
 /* Ethernet Hardware */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 73651a7..8f0a7d7 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -202,9 +202,6 @@
 	MEM_LAYOUT_ENV_SETTINGS
 
 #define CONFIG_GZIP_COMPRESSED
-#define CONFIG_BZIP2
-#define CONFIG_LZO
-#define CONFIG_LZMA
 
 #define CONFIG_CMD_LZMADEC
 #define CONFIG_CMD_USB
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 9456af7..858473a 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -28,9 +28,6 @@
 /*
  * Compression configuration
  */
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Enable device tree support
@@ -139,9 +136,6 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 98b8ef6..f42d07b 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -124,9 +124,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x30800000
 
 /* support additional compression methods */
-#define CONFIG_BZIP2
-#define CONFIG_LZO
-#define CONFIG_LZMA
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
@@ -182,13 +179,10 @@
  */
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_YAFFS2
-#define CONFIG_RBTREE
 
 /* additions for new relocation code, must be added to all boards */
 #define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 53839f7..944a2f0 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -268,10 +268,6 @@
 
 #define CONFIG_OF_LIBFDT
 #define CONFIG_FIT
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 860e95d..bc65b17 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -250,13 +250,9 @@
 #endif /* CONFIG_CMD_NAND */
 
 /* UBI/UBIFS config options */
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
 
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 323da27..43c7812 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -158,9 +158,6 @@
 #define CONFIG_CMD_MTDPARTS		/* Enable MTD parts commands */
 #define CONFIG_CMD_NAND			/* NAND support */
 #define CONFIG_CMD_NAND_LOCK_UNLOCK	/* nand (un)lock commands */
-#define CONFIG_CMD_UBI			/* UBI commands */
-#define CONFIG_CMD_UBIFS		/* UBIFS commands */
-#define CONFIG_LZO			/* LZO is needed for UBIFS */
 
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
@@ -169,7 +166,6 @@
 #undef CONFIG_CMD_JFFS2			/* JFFS2 Support */
 
 /* needed for ubi */
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE       /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 
diff --git a/include/configs/vct.h b/include/configs/vct.h
index b94e2da..3ed240b 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -272,8 +272,6 @@ int vct_gpio_get(int pin);
 #if defined(CONFIG_VCT_ONENAND)
 #define CONFIG_SYS_USE_UBI
 #define	CONFIG_CMD_JFFS2
-#define	CONFIG_CMD_UBI
-#define	CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 05bc7d0..0010913 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -58,10 +58,6 @@
 #define CONFIG_SYS_NAND_BASE		NFC_BASE_ADDR
 
 /* UBI */
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 
 /* Dynamic MTD partition support */
 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index ea605ef..470edfe 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -53,7 +53,6 @@
 #define	CONFIG_BOOTDELAY		2	/* Autoboot delay */
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
-#define	CONFIG_LZMA			/* LZMA compression support */
 #define	CONFIG_OF_LIBFDT
 
 /*
diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index bda9eb9..73e494c 100644
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -60,7 +60,6 @@
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */
-#undef CONFIG_RBTREE
 #undef CONFIG_SYS_IDE_MAXBUS
 #undef CONFIG_SYS_IDE_MAXDEVICE
 #define CONFIG_SYS_IDE_MAXBUS           1
diff --git a/include/configs/x600.h b/include/configs/x600.h
index f4cdace..96e1ad6 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -69,7 +69,6 @@
 /* UBI/UBI config options */
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
 
 /* Ethernet config options */
 #define CONFIG_MII
@@ -117,9 +116,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_RUN
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_LZO
 
 /* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <config_cmd_default.h>
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 1d870aa..4e423f2 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -25,10 +25,8 @@
 #define CONFIG_LMB
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_LZO
 #define CONFIG_FIT
 #undef CONFIG_ZLIB
-#undef CONFIG_GZIP
 #define CONFIG_SYS_BOOTM_LEN		(16 << 20)
 
 /* SATA AHCI storage */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 05f3529..63501db 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -47,7 +47,6 @@
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
 #define	CONFIG_SYS_TEXT_BASE		0x0
-#define	CONFIG_LZMA			/* LZMA compression support */
 
 /*
  * Serial Console Configuration
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 28b4e19..e4c268c 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -40,7 +40,6 @@
 /*
  * Compressions
  */
-#define CONFIG_LZO
 
 /*
  * Hardware drivers
-- 
1.7.11.5




More information about the U-Boot mailing list