summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-22 18:36:16 -0400
committerTom Rini <trini@konsulko.com>2017-07-24 20:35:55 -0400
commitd56b4b19744c314c26dc77585a7c7a9253d1487d (patch)
treec2f61f4eb311a4e81155b4579d69b4fe3d549581 /include
parent24fc9531a14e3d57c6e6afe4df15dc020e7b55d6 (diff)
configs: Migrate RBTREE, LZO, CMD_MTDPARTS, CMD_UBI and CMD_UBIFS
The above CONFIG options are in Kconfig, and now have correct depends and inter-dependencies. Migrate these to configs/ from include/configs/. In the case of CMD_UBIFS also change it to be a default y if CMD_UBI. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r--include/config_cmd_all.h2
-rw-r--r--include/configs/BSC9131RDB.h1
-rw-r--r--include/configs/BSC9132QDS.h1
-rw-r--r--include/configs/M54418TWR.h3
-rw-r--r--include/configs/MPC8313ERDB.h1
-rw-r--r--include/configs/MPC8315ERDB.h1
-rw-r--r--include/configs/P1010RDB.h1
-rw-r--r--include/configs/P1022DS.h1
-rw-r--r--include/configs/T102xQDS.h1
-rw-r--r--include/configs/T102xRDB.h1
-rw-r--r--include/configs/T1040QDS.h1
-rw-r--r--include/configs/T104xRDB.h1
-rw-r--r--include/configs/T208xQDS.h1
-rw-r--r--include/configs/T208xRDB.h1
-rw-r--r--include/configs/TQM834x.h1
-rw-r--r--include/configs/am335x_evm.h1
-rw-r--r--include/configs/am335x_igep003x.h2
-rw-r--r--include/configs/am335x_shc.h1
-rw-r--r--include/configs/am335x_sl50.h1
-rw-r--r--include/configs/am3517_evm.h4
-rw-r--r--include/configs/ap121.h5
-rw-r--r--include/configs/ap143.h5
-rw-r--r--include/configs/apf27.h8
-rw-r--r--include/configs/apx4devkit.h4
-rw-r--r--include/configs/aristainetos-common.h4
-rw-r--r--include/configs/at91sam9n12ek.h1
-rw-r--r--include/configs/at91sam9x5ek.h4
-rw-r--r--include/configs/baltos.h4
-rw-r--r--include/configs/bav335x.h1
-rw-r--r--include/configs/brppt1.h1
-rw-r--r--include/configs/chiliboard.h1
-rw-r--r--include/configs/cm_fx6.h3
-rw-r--r--include/configs/cm_t35.h1
-rw-r--r--include/configs/cm_t3517.h1
-rw-r--r--include/configs/colibri_imx7.h6
-rw-r--r--include/configs/colibri_t20.h7
-rw-r--r--include/configs/colibri_vf.h5
-rw-r--r--include/configs/corvus.h2
-rw-r--r--include/configs/da850evm.h4
-rw-r--r--include/configs/dockstar.h4
-rw-r--r--include/configs/ea20.h4
-rw-r--r--include/configs/ethernut5.h4
-rw-r--r--include/configs/exynos4-common.h1
-rw-r--r--include/configs/flea3.h1
-rw-r--r--include/configs/gw_ventana.h6
-rw-r--r--include/configs/iconnect.h4
-rw-r--r--include/configs/ids8313.h4
-rw-r--r--include/configs/imx27lite-common.h5
-rw-r--r--include/configs/imx31_phycore.h1
-rw-r--r--include/configs/imx6-engicam.h6
-rw-r--r--include/configs/imx6_logic.h1
-rw-r--r--include/configs/ipam390.h4
-rw-r--r--include/configs/km/keymile-common.h6
-rw-r--r--include/configs/km/km_arm.h10
-rw-r--r--include/configs/lacie_kw.h1
-rw-r--r--include/configs/m28evk.h4
-rw-r--r--include/configs/m53evk.h4
-rw-r--r--include/configs/mccmon6.h1
-rw-r--r--include/configs/mcx.h4
-rw-r--r--include/configs/microblaze-generic.h10
-rw-r--r--include/configs/mv-common.h4
-rw-r--r--include/configs/mx28evk.h4
-rw-r--r--include/configs/mx31ads.h1
-rw-r--r--include/configs/mx35pdk.h1
-rw-r--r--include/configs/nas220.h4
-rw-r--r--include/configs/nokia_rx51.h10
-rw-r--r--include/configs/omap3_igep00x0.h2
-rw-r--r--include/configs/omap3_logic.h5
-rw-r--r--include/configs/omap3_overo.h5
-rw-r--r--include/configs/omap3_pandora.h5
-rw-r--r--include/configs/omapl138_lcdk.h4
-rw-r--r--include/configs/p1_p2_rdb_pc.h3
-rw-r--r--include/configs/p1_twr.h1
-rw-r--r--include/configs/pcm052.h6
-rw-r--r--include/configs/pcm058.h6
-rw-r--r--include/configs/pengwyn.h2
-rw-r--r--include/configs/platinum.h4
-rw-r--r--include/configs/pogo_e02.h4
-rw-r--r--include/configs/sama5d3_xplained.h4
-rw-r--r--include/configs/sandbox.h1
-rw-r--r--include/configs/siemens-am33x-common.h4
-rw-r--r--include/configs/smartweb.h2
-rw-r--r--include/configs/smdkc100.h1
-rw-r--r--include/configs/socfpga_common.h8
-rw-r--r--include/configs/socfpga_vining_fpga.h3
-rw-r--r--include/configs/tam3517-common.h4
-rw-r--r--include/configs/tao3530.h1
-rw-r--r--include/configs/taurus.h1
-rw-r--r--include/configs/ti_armv7_common.h1
-rw-r--r--include/configs/ti_armv7_keystone2.h3
-rw-r--r--include/configs/titanium.h4
-rw-r--r--include/configs/tricorder.h4
-rw-r--r--include/configs/vct.h3
-rw-r--r--include/configs/vf610twr.h6
-rw-r--r--include/configs/woodburn_common.h1
-rw-r--r--include/configs/x600.h4
-rw-r--r--include/configs/x86-common.h1
-rw-r--r--include/configs/zmx25.h5
98 files changed, 0 insertions, 311 deletions
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 2874a7850d..06610f9d6e 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -14,7 +14,6 @@
*/
#define CONFIG_CMD_MFSL /* FSL support for Microblaze */
-#define CONFIG_CMD_MTDPARTS /* mtd parts support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_ONENAND /* OneNAND support */
#define CONFIG_CMD_PCI /* pciinfo */
@@ -27,7 +26,6 @@
#define CONFIG_CMD_SAVES /* save S record dump */
#define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */
#define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */
-#define CONFIG_CMD_UBIFS /* UBIFS Support */
#define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */
#define CONFIG_CMD_ZFS /* ZFS Support */
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 59b2252e6f..9c0e4659f9 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -336,7 +336,6 @@ extern unsigned long get_sdram_size(void);
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define MTDIDS_DEFAULT "nand0=ff800000.flash,"
#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \
"8m(kernel),512k(dtb),-(fs)"
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 407e499de1..5491c47a77 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -558,7 +558,6 @@ combinations. this should be removed later
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=88000000.nor,nand0=ff800000.flash,"
#define MTDPARTS_DEFAULT "mtdparts=88000000.nor:256k(dtb),7m(kernel)," \
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 8fb9abd79c..3b2d01e518 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -324,7 +324,6 @@
#ifdef CONFIG_CMD_JFFS2
#define CONFIG_JFFS2_DEV "nand0"
#define CONFIG_JFFS2_PART_OFFSET (0x800000)
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define MTDIDS_DEFAULT "nand0=m54418twr.nand"
@@ -335,10 +334,8 @@
#endif
#ifdef CONFIG_CMD_UBI
-#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/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 38a4a6220b..7494b3d0b2 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -259,7 +259,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
-#define CONFIG_CMD_MTDPARTS
#define MTDIDS_DEFAULT "nand0=e2800000.flash"
#define MTDPARTS_DEFAULT \
"mtdparts=e2800000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 522f12ceec..8799a9eb27 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -235,7 +235,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
-#define CONFIG_CMD_MTDPARTS
#define MTDIDS_DEFAULT "nand0=e0600000.flash"
#define MTDPARTS_DEFAULT \
"mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 0dc062a094..a249fa6ef2 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -354,7 +354,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
-#define CONFIG_CMD_MTDPARTS
#define MTDIDS_DEFAULT "nand0=ff800000.flash"
#define MTDPARTS_DEFAULT \
"mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 2ee6c6442f..132f335dfd 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -534,7 +534,6 @@
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#ifdef CONFIG_PHYS_64BIT
#define MTDIDS_DEFAULT "nor0=fe8000000.nor"
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 2e3a8c1184..cbd92d92f6 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -758,7 +758,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 025e7de8d0..58c93788d7 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -770,7 +770,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.1"
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 86f7880ff1..4e42450da0 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -637,7 +637,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 350dacaa38..69cbee0dfa 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -810,7 +810,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 9edf19081c..4fce859073 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -724,7 +724,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.0"
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 0e70aa83ea..0857bc8f17 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -672,7 +672,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
"spi0=spife110000.1"
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index e8aa168d72..c54de65076 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -518,7 +518,6 @@
* JFFS2 partitions
*/
/* mtdparts command line support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM834x-0"
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index b97f525994..cdccdc0c38 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -20,7 +20,6 @@
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
-# define CONFIG_LZO
#endif
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index b1ffcc8872..22f542dc7d 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -120,8 +120,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),-(UBI)"
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 247679eee3..77ac3fed24 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -26,7 +26,6 @@
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
-# define CONFIG_LZO
#endif
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 2c4033ca59..e0fad52c64 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -13,7 +13,6 @@
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
-# define CONFIG_LZO
#endif
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 829dd3ecb9..7fe822eace 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -89,7 +89,6 @@
/* commands to include */
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
/* I2C */
#define CONFIG_SYS_I2C
@@ -112,9 +111,6 @@
#define CONFIG_NAND_OMAP_GPMC
#define CONFIG_NAND_OMAP_GPMC_PREFETCH
#define CONFIG_BCH
-#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_SYS_NAND_ADDR NAND_BASE /* physical address */
/* to access nand */
#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 2284b8bc66..05d7b3abe6 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -46,11 +46,6 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_SIZE 0x10000
-/*
- * Command
- */
-#define CONFIG_CMD_MTDPARTS
-
/* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 2950783097..91a40c9f4b 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -50,11 +50,6 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_SIZE 0x10000
-/*
- * Command
- */
-#define CONFIG_CMD_MTDPARTS
-
/* Miscellaneous configurable options */
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 073f3b4fef..3cb8fabfa9 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -54,11 +54,9 @@
/*
* U-Boot Commands
*/
-#define CONFIG_CMD_MTDPARTS /* MTD partition support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBIFS
/*
* Memory configurations
@@ -238,12 +236,6 @@
#define CONFIG_SUPPORT_VFAT
/*
- * UBIFS
- */
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-
-/*
* Ethernet (on SOC imx FEC)
*/
#define CONFIG_FEC_MXC
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index cce39f27c7..e0e577a622 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -52,10 +52,6 @@
/* UBI and NAND partitioning */
#ifdef CONFIG_CMD_NAND
-#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-common.h b/include/configs/aristainetos-common.h
index 7360e11ff1..b6edfe0948 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -208,12 +208,8 @@
#define CONFIG_MXC_USB_FLAGS 0
/* UBI support */
-#define CONFIG_LZO
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBIFS
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 50ddbd6475..5b3a4591fd 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -90,7 +90,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_MTDPARTS
#define MTDIDS_DEFAULT "nand0=atmel_nand"
#define MTDPARTS_DEFAULT \
"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index fd2dbed137..799b75719e 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -90,11 +90,7 @@
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS
#endif
/* USB */
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index fe4ac05f38..29710a1fcd 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -35,12 +35,8 @@
#define CONFIG_SYS_BOOTM_LEN SZ_64M
/* UBI Support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS
/* I2C configuration */
#undef CONFIG_SYS_OMAP24_I2C_SPEED
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 71b1b96ec4..8b1809e9c8 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -22,7 +22,6 @@
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
-# define CONFIG_LZO
#endif
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 07e743ac81..e35ea0ea4a 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -54,7 +54,6 @@
*/
#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NAND)
#define CONFIG_MTD_DEVICE /* Required for mtdparts */
-#define CONFIG_CMD_MTDPARTS
#endif /* CONFIG_SPI_BOOT, ... */
#ifdef CONFIG_SPL_OS_BOOT
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index 20168b22b6..0802e1b8e5 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -15,7 +15,6 @@
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
-# define CONFIG_LZO
#endif
/* Clock Defines */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 1d9c1650d5..4d60edd56d 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -17,9 +17,6 @@
#define CONFIG_SYS_LITTLE_ENDIAN
#define CONFIG_MACH_TYPE 4273
-/* CMD */
-#define CONFIG_CMD_MTDPARTS
-
/* MMC */
#define CONFIG_SYS_FSL_USDHC_NUM 3
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index ee7c9de969..5f92308682 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -83,7 +83,6 @@
#define CONFIG_USB_TTY
/* commands to include */
-#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nand0=nand"
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index dd78b0c7e8..346608d8e3 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -91,7 +91,6 @@
#endif /* CONFIG_USB_MUSB_AM35X */
/* commands to include */
-#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nand0=nand"
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 3388a95ed3..ffcd98bf76 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -172,13 +172,7 @@
#define CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES
#define CONFIG_CMD_NAND_TORTURE
-/* UBI stuff */
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS /* increases size by almost 60 KB */
-
/* Dynamic MTD partition support */
-#define CONFIG_CMD_MTDPARTS /* Enable 'mtdparts' command line support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define MTDIDS_DEFAULT "nand0=gpmi-nand"
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 7355f78fcf..cbcd5e4d38 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -46,7 +46,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Dynamic MTD partition support */
-#define CONFIG_CMD_MTDPARTS /* Enable 'mtdparts' command line support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define MTDIDS_DEFAULT "nand0=tegra_nand"
@@ -62,12 +61,6 @@
#undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */
#define CONFIG_ENV_SIZE (SZ_64K)
-/* UBI */
-#define CONFIG_CMD_UBIFS /* increases size by almost 60 KB */
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-
-
#define BOARD_EXTRA_ENV_SETTINGS \
"mtdparts=" MTDPARTS_DEFAULT "\0"
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 6e8cd914b3..72e3ea73e8 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -49,7 +49,6 @@
#define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR
/* Dynamic MTD partition support */
-#define CONFIG_CMD_MTDPARTS /* Enable 'mtdparts' command line support */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define MTDIDS_DEFAULT "nand0=vf610_nfc"
@@ -63,10 +62,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS /* increases size by almost 60 KB */
-
#define CONFIG_FEC_MXC
#define CONFIG_MII
#define IMX_FEC_BASE ENET1_BASE_ADDR
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 8b8b1220b4..3635add4b2 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -97,8 +97,6 @@
/* USB */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
-/* USB DFU support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index b7199bb9e0..614417bff1 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -284,12 +284,8 @@
#ifdef CONFIG_USE_NAND
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBIFS
#endif
#ifdef CONFIG_USE_SPIFLASH
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 3b56fd6739..394485ae8d 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -79,11 +79,7 @@
/*
* File system
*/
-#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 6fc6ec90af..8d38087ae6 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -140,12 +140,8 @@
#ifdef CONFIG_SYS_USE_NAND
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBIFS
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_PAGE_2K
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index e7f7a7cbe6..6f7817a33e 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -84,13 +84,11 @@
#define CONFIG_AT91_GPIO
/* Command line configuration */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND
#ifndef MINIMAL_LOADER
#define CONFIG_CMD_REISER
#define CONFIG_CMD_SAVES
-#define CONFIG_CMD_UBIFS
#endif
/* NAND flash */
@@ -186,8 +184,6 @@
#define MTDIDS_DEFAULT "nand0=atmel_nand"
#define MTDPARTS_DEFAULT "mtdparts=atmel_nand:-(root)"
#endif
-#define CONFIG_LZO
-#define CONFIG_RBTREE
/* Boot command */
#define CONFIG_CMDLINE_TAG
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 787c6de3ae..c995f35b73 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -21,7 +21,6 @@
#define CONFIG_MMC_DEFAULT_DEV 0
#undef CONFIG_CMD_ONENAND
-#undef CONFIG_CMD_MTDPARTS
/* TIZEN THOR downloader support */
#define CONFIG_CMD_THOR_DOWNLOAD
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 0ab33953ac..976730cdd3 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -122,7 +122,6 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index de08f2c7cc..ef8911fafa 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -103,9 +103,6 @@
#define CONFIG_SUPPORT_EMMC_BOOT
#define CONFIG_SUPPORT_EMMC_RPMB
-/* Filesystem support */
-#define CONFIG_CMD_UBIFS
-
/*
* SATA Configs
*/
@@ -140,7 +137,6 @@
/* Various command support */
#define CONFIG_CMD_UNZIP /* gzwrite */
-#define CONFIG_RBTREE
/* Ethernet support */
#define CONFIG_FEC_MXC
@@ -204,8 +200,6 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_LZO
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#ifdef CONFIG_SPI_FLASH
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 63e50606d7..72c64c6f9a 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -25,7 +25,6 @@
* Compression configuration
*/
#define CONFIG_BZIP2
-#define CONFIG_LZO
/*
* Commands configuration
@@ -86,10 +85,7 @@
/*
* File system
*/
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#endif /* _CONFIG_ICONNECT_H */
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 7bedcb94d7..bd6da684bc 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -476,7 +476,6 @@
#define CONFIG_JFFS2_DEV "0"
/* mtdparts command line support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_DEVICE
#define MTDIDS_DEFAULT "nor0=ff800000.flash,nand0=e1000000.flash"
@@ -527,9 +526,6 @@
/* UBI Support */
#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_PARTITIONS
/* bootcount support */
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 18d8d2fd3d..e964b492e3 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -139,11 +139,6 @@
#define CONFIG_MXC_GPIO
/*
- * MTD partitions
- */
-#define CONFIG_CMD_MTDPARTS
-
-/*
* U-Boot general configuration
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 739af03e88..aa5698963d 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -161,7 +161,6 @@
/*
* JFFS2 partitions
*/
-#undef CONFIG_CMD_MTDPARTS
#define CONFIG_JFFS2_DEV "nor0"
/* EET platform additions */
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 12a9bfb589..e0bdb656b2 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -160,17 +160,11 @@
/* MTD device */
# define CONFIG_MTD_DEVICE
-# define CONFIG_CMD_MTDPARTS
# define CONFIG_MTD_PARTITIONS
# define MTDIDS_DEFAULT "nand0=gpmi-nand"
# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
"1m(env),8m(kernel),1m(dtb),-(rootfs)"
-/* UBI */
-# define CONFIG_CMD_UBIFS
-# define CONFIG_RBTREE
-# define CONFIG_LZO
-
# define CONFIG_APBH_DMA
# define CONFIG_APBH_DMA_BURST
# define CONFIG_APBH_DMA_BURST8
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 821f1ffacd..648404fb74 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -156,7 +156,6 @@
/* MTD device */
# define CONFIG_MTD_DEVICE
-# define CONFIG_CMD_MTDPARTS
# define CONFIG_MTD_PARTITIONS
# define MTDIDS_DEFAULT "nand0=gpmi-nand"
# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:4m(uboot)," \
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index f78aa47ae2..09f3a0471f 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -252,12 +252,8 @@
#define CONFIG_CMD_NAND
#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#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 c2b38d8af6..1e33328f41 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -10,11 +10,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_MTDPARTS
-
#undef CONFIG_WATCHDOG /* disable platform specific watchdog */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
@@ -60,7 +55,6 @@
#define CONFIG_BOOTP_HOSTNAME
/* UBI Support for all Keymile boards */
-#define CONFIG_RBTREE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_CONCAT
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 0c5f6e7515..02e8a97f2f 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -116,11 +116,6 @@
#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */
/*
- * Commands configuration
- */
-#define CONFIG_CMD_MTDPARTS
-
-/*
* NAND Flash configuration
*/
#define CONFIG_SYS_MAX_NAND_DEVICE 1
@@ -154,11 +149,6 @@
#define CONFIG_KM_COMMON_ETH_INIT /* standard km ethernet_present for piggy */
/*
- * UBI related stuff
- */
-#define CONFIG_SYS_USE_UBI
-
-/*
* I2C related stuff
*/
#undef CONFIG_I2C_MVTWSI
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 66e65c878c..433e0ddbcc 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -73,7 +73,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/m28evk.h b/include/configs/m28evk.h
index 8dea0313a3..bd141fa4aa 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -36,10 +36,6 @@
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
-#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 a92c228334..8bf0bd5548 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -100,10 +100,6 @@
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
-#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/mccmon6.h b/include/configs/mccmon6.h
index fca1af9d2b..8a672812d0 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -80,7 +80,6 @@
#define CONFIG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) }
/* MTD support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0c237a59cb..0f3d7ae13c 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -82,12 +82,8 @@
/* commands to include */
#define CONFIG_CMD_NAND /* NAND support */
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index cc7f81955e..39d7bd1c2c 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -171,8 +171,6 @@
#define CONFIG_CMD_MFSL
#if defined(FLASH)
-# undef CONFIG_CMD_UBIFS
-
# if !defined(RAMENV)
# define CONFIG_CMD_SAVES
# endif
@@ -183,8 +181,6 @@
# if !defined(RAMENV)
# define CONFIG_CMD_SAVES
# endif
-#else
-# undef CONFIG_CMD_UBIFS
#endif
#endif
@@ -192,18 +188,12 @@
# define CONFIG_MTD_PARTITIONS
#endif
-#if defined(CONFIG_CMD_UBIFS)
-# define CONFIG_LZO
-#endif
-
#if defined(CONFIG_CMD_UBI)
# define CONFIG_MTD_PARTITIONS
-# define CONFIG_RBTREE
#endif
#if defined(CONFIG_MTD_PARTITIONS)
/* MTD partitions */
-#define CONFIG_CMD_MTDPARTS /* mtdparts command line support */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=flash-0"
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 13bd6cff3d..18003e1eba 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -128,12 +128,8 @@
* File system
*/
#ifdef CONFIG_SYS_MVFS
-#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/mx28evk.h b/include/configs/mx28evk.h
index fac26fb2f2..66a310cff9 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -64,10 +64,6 @@
/* UBI and NAND partitioning */
#ifdef CONFIG_CMD_NAND
-#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/mx31ads.h b/include/configs/mx31ads.h
index 5db3677566..d84801b7c6 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -153,7 +153,6 @@
/*
* JFFS2 partitions
*/
-#undef CONFIG_CMD_MTDPARTS
#define CONFIG_JFFS2_DEV "nor0"
#endif /* __CONFIG_H */
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index e60b96f7dc..a4191ac86f 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -141,7 +141,6 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index dfa81223c4..f3ed31386c 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -103,12 +103,8 @@
*/
#define CONFIG_JFFS2_NAND
#define CONFIG_JFFS2_LZO
-#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 5e2d5991e7..e157df4b95 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -105,11 +105,6 @@
#ifdef ONENAND_SUPPORT
#define CONFIG_CMD_ONENAND /* ONENAND support */
-#define CONFIG_CMD_MTDPARTS /* mtd parts support */
-
-#ifdef UBIFS_SUPPORT
-#define CONFIG_CMD_UBIFS /* UBIFS Support */
-#endif
#endif
@@ -179,11 +174,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#ifdef UBIFS_SUPPORT
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#endif
-
#define MTDIDS_DEFAULT "onenand0=onenand"
#define MTDPARTS_DEFAULT "mtdparts=onenand:" \
__stringify(PART1_SIZE) PART1_SUFF "(" PART1_NAME ")ro," \
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 59da726bd6..9347a169a5 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -52,7 +52,6 @@
#define CONFIG_USBD_MANUFACTURER "Texas Instruments"
#define CONFIG_USBD_PRODUCT_NAME "IGEP"
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_ONENAND
#ifndef CONFIG_SPL_BUILD
@@ -89,7 +88,6 @@
#define CONFIG_SMC911X_BASE 0x2C000000
#endif /* (CONFIG_CMD_NET) */
-#define CONFIG_RBTREE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_SYS_MTDPARTS_RUNTIME
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index f8978037f2..14dabfeb50 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -54,7 +54,6 @@
/* commands to include */
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */
/* I2C */
@@ -80,10 +79,6 @@
#ifdef CONFIG_NAND
#define CONFIG_NAND_OMAP_GPMC
-#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_SYS_NAND_ADDR NAND_BASE /* physical address */
/* to access nand */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 111aec58d3..950b91a4d9 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -46,11 +46,6 @@
/* commands to include */
#ifdef CONFIG_NAND
-#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 */
/* NAND block size is 128 KiB. Synchronize these values with
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index efee5b0c3f..db5873642a 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -58,11 +58,6 @@
#define CONFIG_SYS_NAND_OOBSIZE 64
#ifdef CONFIG_NAND
-#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 */
#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 5f118950aa..cb3513d318 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -294,12 +294,8 @@
#ifdef CONFIG_USE_NAND
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBIFS
#endif
#if !defined(CONFIG_USE_NAND) && \
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index a72a57c904..a76e69fa9a 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -72,7 +72,6 @@
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=ec000000.nor"
#define MTDPARTS_DEFAULT "mtdparts=ec000000.nor:128k(dtb),6016k(kernel)," \
@@ -98,7 +97,6 @@
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#ifdef CONFIG_PHYS_64BIT
#define MTDIDS_DEFAULT "nor0=fef000000.nor"
@@ -157,7 +155,6 @@
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#ifdef CONFIG_PHYS_64BIT
#define MTDIDS_DEFAULT "nor0=fef000000.nor"
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index dffb15aea9..04d01e2ec3 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -350,7 +350,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=ec000000.nor"
#define MTDPARTS_DEFAULT "mtdparts=ec000000.nor:256k(vsc7385-firmware)," \
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 8c0e26486f..9e1c89bd33 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -33,13 +33,7 @@
#define CONFIG_JFFS2_NAND
-/* UBI */
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-
/* Dynamic MTD partition support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 39018ac62f..a150c066c4 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -77,17 +77,11 @@
#define CONFIG_APBH_DMA_BURST8
/* Filesystem support */
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define MTDIDS_DEFAULT "nand0=nand"
#define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
-/* Various command support */
-#define CONFIG_RBTREE
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 9c8720bee9..482045d99f 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -152,8 +152,6 @@
/* #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 */
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
-#define CONFIG_CMD_MTDPARTS
-
#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
/* Size must be a multiple of Nand erase size (524288 b) */
#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(SPL)," \
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 9c2182cbea..e5baae0170 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -19,10 +19,8 @@
* Console configuration
*/
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND
#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBIFS
/*
* Hardware configuration
@@ -130,10 +128,8 @@
sizeof(CONFIG_SYS_PROMPT) + 16)
/* 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 f94e74f0fc..2956d20d18 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -77,11 +77,7 @@
/*
* File system
*/
-#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/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index fbe26cae21..74cdefe92b 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -53,13 +53,9 @@
#define CONFIG_PMECC_CAP 4
#define CONFIG_PMECC_SECTOR_SIZE 512
#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS
#endif
/* USB */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 1e8404cbdf..072299b3f9 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -145,7 +145,6 @@
#define CONFIG_GZIP_COMPRESSED
#define CONFIG_BZIP2
-#define CONFIG_LZO
#ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_IDE_MAXBUS 1
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 21029d10ae..f393edbf53 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -242,12 +242,8 @@
/* UBI Support */
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS
#endif
/* Commen environment */
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 8400278209..0550255b50 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -91,7 +91,6 @@
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define MTDIDS_NAME_STR "atmel_nand"
#define MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
@@ -155,7 +154,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
/* USB DFU support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index c1aace7a80..dded4d4bf9 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -62,7 +62,6 @@
#undef CONFIG_CMD_NAND
#define CONFIG_CMD_ONENAND
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 1bed85e78b..7e63b55829 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -188,7 +188,6 @@ unsigned int cm_get_l4_sp_clk_hz(void);
/* Enable multiple SPI NOR flash manufacturers */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_SPI_FLASH_MTD
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nor0=ff705000.spi.0"
@@ -281,13 +280,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
"-@1536k(UBI)\0"
#endif
-/* UBI and UBIFS support */
-#if defined(CONFIG_CMD_SF) || defined(CONFIG_CMD_NAND)
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#endif
-
/*
* SPL
*
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index e2bdfb12f9..2742e66f55 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -170,9 +170,6 @@
"else echo \"Unsupported boot mode: \"${bootmode} ; " \
"fi\0" \
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define MTDPARTS_DEFAULT \
"mtdparts=ff705000.spi.0:" \
"1m(u-boot)," \
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 0b87c9ca97..16e25c4ea0 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -222,12 +222,8 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_MTDPARTS
/* Setup MTD for NAND on the SOM */
#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index f994d2dbf3..897966cfab 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -62,7 +62,6 @@
#define CONFIG_ENV_OVERWRITE
/* commands to include */
-#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define MTDIDS_DEFAULT "nand0=nand"
#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index bed2a5c3c0..e03731b9b9 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -114,7 +114,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
/* USB DFU support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index a4676d3a7f..a94748c35d 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -139,7 +139,6 @@
*/
#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND) || defined(CONFIG_NAND_DAVINCI)
#define CONFIG_MTD_DEVICE /* Required for mtdparts */
-#define CONFIG_CMD_MTDPARTS
#endif
#define CONFIG_SUPPORT_RAW_INITRD
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index ac8dabd9ca..3fadef7a0a 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -186,8 +186,6 @@
#define CONFIG_SYS_NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
#define CONFIG_MTD_PARTITIONS
-#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," \
@@ -203,7 +201,6 @@
/* U-Boot command configuration */
#define CONFIG_CMD_SAVES
-#define CONFIG_CMD_UBIFS
/* U-Boot general configuration */
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 79e37e2cef..ba5a1416b6 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -186,11 +186,7 @@
#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_UBIFS
#endif /* __CONFIG_H */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index d18a333d01..1d58701d98 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -98,14 +98,10 @@
#define CONFIG_SYS_NAND_MAX_ECCPOS 56
/* commands to include */
-#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_UBIFS /* UBIFS commands */
-#define CONFIG_LZO /* LZO is needed for UBIFS */
/* 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 9792c46bc3..19192ddcc5 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -233,11 +233,8 @@ int vct_gpio_get(int pin);
* UBI configuration
*/
#if defined(CONFIG_VCT_ONENAND)
-#define CONFIG_SYS_USE_UBI
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
#define MTDIDS_DEFAULT "onenand0=onenand"
#define MTDPARTS_DEFAULT "mtdparts=onenand:128k(u-boot)," \
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 2460294d88..ae5f627ad8 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -39,13 +39,7 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR
-/* UBI */
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-
/* Dynamic MTD partition support */
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define MTDIDS_DEFAULT "nand0=fsl_nfc"
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 46a6706171..68a9db5b20 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -135,7 +135,6 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/x600.h b/include/configs/x600.h
index c7d32fedb3..63889f9b27 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -71,7 +71,6 @@
/* UBI/UBI config options */
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
/* Ethernet config options */
#define CONFIG_MII
@@ -106,11 +105,8 @@
/*
* Command support defines
*/
-#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND
#define CONFIG_CMD_SAVES
-#define CONFIG_CMD_UBIFS
-#define CONFIG_LZO
/* Filesystem support (for USB key) */
#define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index d104449e3b..78cce9e770 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -23,7 +23,6 @@
#define CONFIG_LMB
-#define CONFIG_LZO
#undef CONFIG_ZLIB
#undef CONFIG_GZIP
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index c1daf65621..96cc1b7252 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -35,11 +35,6 @@
#define CONFIG_INITRD_TAG
/*
- * Compressions
- */
-#define CONFIG_LZO
-
-/*
* Hardware drivers
*/