summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/10m50_devboard.h1
-rw-r--r--include/configs/BSC9131RDB.h2
-rw-r--r--include/configs/BSC9132QDS.h2
-rw-r--r--include/configs/M54418TWR.h5
-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.h2
-rw-r--r--include/configs/T102xQDS.h2
-rw-r--r--include/configs/T102xRDB.h2
-rw-r--r--include/configs/T1040QDS.h2
-rw-r--r--include/configs/T104xRDB.h2
-rw-r--r--include/configs/T208xQDS.h2
-rw-r--r--include/configs/T208xRDB.h2
-rw-r--r--include/configs/TQM834x.h1
-rw-r--r--include/configs/am335x_igep003x.h3
-rw-r--r--include/configs/am3517_evm.h2
-rw-r--r--include/configs/apf27.h2
-rw-r--r--include/configs/apx4devkit.h4
-rw-r--r--include/configs/aristainetos-common.h2
-rw-r--r--include/configs/at91sam9n12ek.h3
-rw-r--r--include/configs/at91sam9x5ek.h3
-rw-r--r--include/configs/baltos.h2
-rw-r--r--include/configs/brppt1.h17
-rw-r--r--include/configs/cm_fx6.h2
-rw-r--r--include/configs/cm_t35.h2
-rw-r--r--include/configs/cm_t3517.h2
-rw-r--r--include/configs/colibri_imx7.h2
-rw-r--r--include/configs/colibri_t20.h2
-rw-r--r--include/configs/colibri_vf.h2
-rw-r--r--include/configs/corvus.h3
-rw-r--r--include/configs/da850evm.h7
-rw-r--r--include/configs/display5.h4
-rw-r--r--include/configs/dns325.h2
-rw-r--r--include/configs/dockstar.h2
-rw-r--r--include/configs/draak.h1
-rw-r--r--include/configs/ds414.h2
-rw-r--r--include/configs/ea20.h3
-rw-r--r--include/configs/ethernut5.h2
-rw-r--r--include/configs/flea3.h2
-rw-r--r--include/configs/goflexhome.h3
-rw-r--r--include/configs/guruplug.h2
-rw-r--r--include/configs/gw_ventana.h2
-rw-r--r--include/configs/harmony.h2
-rw-r--r--include/configs/hikey.h2
-rw-r--r--include/configs/ib62x0.h2
-rw-r--r--include/configs/iconnect.h4
-rw-r--r--include/configs/ids8313.h2
-rw-r--r--include/configs/imx27lite-common.h1
-rw-r--r--include/configs/imx6-engicam.h2
-rw-r--r--include/configs/imx6_logic.h2
-rw-r--r--include/configs/ipam390.h3
-rw-r--r--include/configs/km/keymile-common.h2
-rw-r--r--include/configs/mccmon6.h2
-rw-r--r--include/configs/mcx.h3
-rw-r--r--include/configs/microblaze-generic.h9
-rw-r--r--include/configs/mx28evk.h4
-rw-r--r--include/configs/mx35pdk.h2
-rw-r--r--include/configs/nas220.h2
-rw-r--r--include/configs/nokia_rx51.h2
-rw-r--r--include/configs/nsa310s.h2
-rw-r--r--include/configs/omap3_beagle.h1
-rw-r--r--include/configs/omap3_evm.h1
-rw-r--r--include/configs/omap3_igep00x0.h1
-rw-r--r--include/configs/omap3_logic.h2
-rw-r--r--include/configs/omap3_overo.h2
-rw-r--r--include/configs/omap3_pandora.h4
-rw-r--r--include/configs/omapl138_lcdk.h5
-rw-r--r--include/configs/openrd.h2
-rw-r--r--include/configs/p1_p2_rdb_pc.h6
-rw-r--r--include/configs/p1_twr.h2
-rw-r--r--include/configs/pcm052.h2
-rw-r--r--include/configs/pcm058.h2
-rw-r--r--include/configs/pfla02.h2
-rw-r--r--include/configs/platinum.h2
-rw-r--r--include/configs/pogo_e02.h4
-rw-r--r--include/configs/rcar-gen2-common.h2
-rw-r--r--include/configs/s5pc210_universal.h3
-rw-r--r--include/configs/sama5d3_xplained.h3
-rw-r--r--include/configs/sheevaplug.h2
-rw-r--r--include/configs/siemens-am33x-common.h5
-rw-r--r--include/configs/smartweb.h4
-rw-r--r--include/configs/smdkc100.h3
-rw-r--r--include/configs/socfpga_common.h2
-rw-r--r--include/configs/spear-common.h2
-rw-r--r--include/configs/stmark2.h1
-rw-r--r--include/configs/sunxi-common.h3
-rw-r--r--include/configs/tam3517-common.h3
-rw-r--r--include/configs/tao3530.h1
-rw-r--r--include/configs/taurus.h2
-rw-r--r--include/configs/ti_armv7_common.h3
-rw-r--r--include/configs/ti_armv7_keystone2.h1
-rw-r--r--include/configs/titanium.h2
-rw-r--r--include/configs/tricorder.h3
-rw-r--r--include/configs/uniphier.h1
-rw-r--r--include/configs/vct.h4
-rw-r--r--include/configs/vf610twr.h2
-rw-r--r--include/configs/wb45n.h2
-rw-r--r--include/configs/woodburn_common.h2
-rw-r--r--include/configs/x600.h2
-rw-r--r--include/configs/xilinx_zynqmp.h1
-rw-r--r--include/configs/xilinx_zynqmp_mini.h1
-rw-r--r--include/configs/zynq-common.h1
103 files changed, 14 insertions, 246 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 1162663e4d..719a22d797 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -22,7 +22,6 @@
*/
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 1024
-#define CONFIG_MTD_DEVICE
/*
* NET options
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 026e9df6d7..93366d1048 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -312,8 +312,6 @@ extern unsigned long get_sdram_size(void);
/*
* Dynamic MTD Partition support with mtdparts
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
/*
* Environment Configuration
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index a99bdc447e..c5c199e6c2 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -512,8 +512,6 @@ combinations. this should be removed later
* Dynamic MTD Partition support with mtdparts
*/
#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
/*
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index c252fb6312..a9d456c50b 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -284,14 +284,9 @@
#ifdef CONFIG_CMD_JFFS2
#define CONFIG_JFFS2_DEV "nand0"
#define CONFIG_JFFS2_PART_OFFSET (0x800000)
-#define CONFIG_MTD_DEVICE
#endif
-#ifdef CONFIG_CMD_UBI
-#define CONFIG_MTD_DEVICE /* needed for mtdparts command */
-#define CONFIG_MTD_PARTITIONS /* mtdparts and UBI support */
-#endif
/* Cache Configuration */
#define CONFIG_SYS_CACHELINE_SIZE 16
#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 794d045d37..1f56deb151 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -249,7 +249,6 @@
#define CONFIG_SYS_NAND_BASE 0xE2800000
#endif
-#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
#define CONFIG_SYS_MAX_NAND_DEVICE 1
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 1daf9102f4..e61cf64f65 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -228,7 +228,6 @@
#define CONFIG_SYS_NAND_BASE 0xE0600000
#endif
-#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
#define CONFIG_SYS_MAX_NAND_DEVICE 1
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index b29a5113aa..61ab0cca98 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -335,7 +335,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE
#endif
-#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITION
#define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 582dd360cd..7c0afb42b9 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -510,8 +510,6 @@
/*
* Dynamic MTD Partition support with mtdparts
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
/*
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index f0ba796b4e..c91781f645 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -731,8 +731,6 @@ unsigned long get_board_ddr_clk(void);
* Dynamic MTD Partition support with mtdparts
*/
#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 3778095760..fc35d6646b 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -747,8 +747,6 @@ unsigned long get_board_ddr_clk(void);
* Dynamic MTD Partition support with mtdparts
*/
#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index b73d914e55..7ab6b2f47e 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -614,8 +614,6 @@ unsigned long get_board_ddr_clk(void);
* Dynamic MTD Partition support with mtdparts
*/
#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 8dbadc0f38..4d2e969ca2 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -766,8 +766,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
* Dynamic MTD Partition support with mtdparts
*/
#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 8f99fb808d..b0a1a0a925 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -698,8 +698,6 @@ unsigned long get_board_ddr_clk(void);
* Dynamic MTD Partition support with mtdparts
*/
#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index e1fe4c759e..9179858ec4 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -648,8 +648,6 @@ unsigned long get_board_ddr_clk(void);
* Dynamic MTD Partition support with mtdparts
*/
#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index bde8c3b882..1cf37ef11b 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -475,7 +475,6 @@
* JFFS2 partitions
*/
/* mtdparts command line support */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
/* default mtd partition table */
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index a429dd9910..5fe7565131 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -108,9 +108,6 @@
/* NAND support */
#define CONFIG_SYS_NAND_ONFI_DETECTION 1
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-
/* SPL */
/* UBI configuration */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 066110370e..9a20796214 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -88,8 +88,6 @@
#define CONFIG_SYS_NAND_MAX_ECCPOS 56
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
-#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
/* NAND block size is 128 KiB. Synchronize these values with
* corresponding Device Tree entries in Linux:
* MLO(SPL) 4 * NAND_BLOCK_SIZE = 512 KiB @ 0x000000
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index a930307a14..f4e0c1a762 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -184,8 +184,6 @@
/*
* Partitions & Filsystems
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
/*
* Ethernet (on SOC imx FEC)
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index ebebec07fc..00ba2eab6a 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -44,10 +44,6 @@
#endif
/* UBI and NAND partitioning */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#endif
/* FEC Ethernet on SoC */
#ifdef CONFIG_CMD_NET
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 209b378191..bfa89b5d0a 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -193,8 +193,6 @@
#define CONFIG_MXC_USB_FLAGS 0
/* UBI support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 05046ac7f1..739ea29737 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -66,9 +66,6 @@
#define CONFIG_PMECC_CAP 2
#define CONFIG_PMECC_SECTOR_SIZE 512
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"mtdparts="CONFIG_MTDPARTS_DEFAULT"\0" \
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 04ee0a94a8..a30e345fef 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -54,9 +54,6 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD4
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5
-
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif
/* PMECC & PMERRLOC */
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 03559bd4f5..a5737708b7 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -35,8 +35,6 @@
#define CONFIG_SYS_BOOTM_LEN SZ_64M
/* UBI Support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
/* I2C configuration */
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index aa476f6355..5badd2da8b 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -41,9 +41,20 @@
* both for ease of use in U-Boot and for passing information on to
* the Linux kernel.
*/
-#if defined(CONFIG_NAND)
-#define CONFIG_MTD_DEVICE /* Required for mtdparts */
-#endif
+
+#ifdef CONFIG_SPL_OS_BOOT
+#define CONFIG_SYS_SPL_ARGS_ADDR 0x80F80000
+
+/* RAW SD card / eMMC */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x900 /* address 0x120000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address 0x10000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */
+
+/* NAND */
+#ifdef CONFIG_NAND
+#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x140000
+#endif /* CONFIG_NAND */
+#endif /* CONFIG_SPL_OS_BOOT */
#ifdef CONFIG_NAND
#define CONFIG_SPL_NAND_BASE
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 5bdc76dceb..5f3b97f6e6 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -47,8 +47,6 @@
/* MTD support */
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_SPI_FLASH_MTD
#endif
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index e1bb24c00c..415924549b 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -74,8 +74,6 @@
#define CONFIG_USB_TTY
/* commands to include */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 5c45c00a3d..2c889d4a85 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -81,8 +81,6 @@
#endif /* CONFIG_USB_MUSB_AM35X */
/* commands to include */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index b0389794bd..ec5aade852 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -159,8 +159,6 @@
#define CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES
/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
/* DMA stuff, needed for GPMI/MXS NAND support */
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 49d6263672..4a18c72a53 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -41,8 +41,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
/* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
#define CONFIG_ENV_OFFSET (SZ_2M)
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index a7b647c6a2..1d15651c23 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -43,8 +43,6 @@
#define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR
/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index f1cd955afa..66fdbc2e9d 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -81,9 +81,6 @@
#define CONFIG_NET_RETRY_COUNT 20
#define CONFIG_AT91_WANTS_COMMON_PHY
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
/* DFU class support */
#define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M)
#define DFU_MANIFEST_POLL_TIMEOUT 25000
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 973a322769..beb9575256 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -221,8 +221,6 @@
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_SPI_FLASH_MTD
#endif
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
#endif
#define CONFIG_DA8XX_GPIO
@@ -272,11 +270,6 @@
#define CONFIG_CLOCKS
#endif
-#ifdef CONFIG_NAND
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#endif
-
#if !defined(CONFIG_NAND) && \
!defined(CONFIG_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH)
diff --git a/include/configs/display5.h b/include/configs/display5.h
index f3c8757385..692a95938b 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -36,9 +36,7 @@
*/
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_DEVICE
#define CONFIG_SPI_FLASH_MTD
-#define CONFIG_MTD_PARTITIONS
#endif
/* Below values are "dummy" - only to avoid build break */
@@ -393,8 +391,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Commands */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
/* Watchdog */
#define CONFIG_HW_WATCHDOG
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index dec71038bf..0d52ffb4d7 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -27,8 +27,6 @@
/*
* Commands configuration
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_NR_DRAM_BANKS 1
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 896bca2f98..f33978829d 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -68,7 +68,5 @@
/*
* File system
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
#endif /* _CONFIG_DOCKSTAR_H */
diff --git a/include/configs/draak.h b/include/configs/draak.h
index e1b9bf1885..5d1da21e99 100644
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -27,7 +27,6 @@
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_FLASH_SHOW_PROGRESS 45
-#define CONFIG_MTD_DEVICE
#define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 }
#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 27308c92ff..b9b708ad41 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -61,8 +61,6 @@
#endif
/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 211243123a..b7a839f0b3 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -113,9 +113,6 @@
/* NAND Setup */
#ifdef CONFIG_SYS_USE_NAND
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
#define CONFIG_SYS_NAND_PAGE_2K
#define CONFIG_SYS_NAND_NO_SUBPAGE
#define CONFIG_SYS_NAND_CS 2
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index edc75150a3..72a5d220e1 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -141,8 +141,6 @@
#endif
/* File systems */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
/* Boot command */
#define CONFIG_CMDLINE_TAG
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index cda5f4d6eb..9d16428606 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -106,9 +106,7 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_MTD_PARTITIONS
/*
* FLASH and environment organization
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 8b05e0a53d..29e104f3c6 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -41,9 +41,6 @@
* Commands configuration
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
-
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 04b7e944a4..739ab320f6 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -18,8 +18,6 @@
* Standard filesystems
*/
#define CONFIG_BZIP2
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-plug-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 1b7e29ca5e..b078cc5466 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -171,8 +171,6 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
/* Persistent Environment Config */
#if defined(CONFIG_ENV_IS_IN_MMC)
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 51e284e2e9..fc5ed5b2fd 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -30,8 +30,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
/* Environment in NAND (which is 512M), aligned to start of last sector */
#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index c451f63cfb..29d4db9707 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -61,8 +61,6 @@
/* Command line configuration */
-#define CONFIG_MTD_PARTITIONS
-
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index a7643166f4..f8d3c3b63f 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -26,8 +26,6 @@
/*
* Commands configuration
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 1fe4618da5..87113d7805 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -28,8 +28,6 @@
/*
* Commands configuration
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-common.h should be defined after CMD configs since it used them
@@ -75,7 +73,5 @@
/*
* File system
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif /* _CONFIG_ICONNECT_H */
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 020d29072f..b633de60e9 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -460,7 +460,6 @@
/* mtdparts command line support */
#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_MTD_DEVICE
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=" __stringify(CONFIG_NETDEV) "\0" \
@@ -503,6 +502,5 @@
"bootm ${loadaddr} - ${fdtaddr}"
/* UBI Support */
-#define CONFIG_MTD_PARTITIONS
#endif /* __CONFIG_H */
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 7cf5e0bd70..dddb2c9b0e 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -116,7 +116,6 @@
* MTD
*/
#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_MTD_DEVICE
/*
* NAND
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 28c982a528..7260f8013f 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -153,8 +153,6 @@
# define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
/* MTD device */
-# define CONFIG_MTD_DEVICE
-# define CONFIG_MTD_PARTITIONS
#endif
/* Ethernet */
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 0226510b2e..8de4c1bb98 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -145,8 +145,6 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
/* MTD device */
-# define CONFIG_MTD_DEVICE
-# define CONFIG_MTD_PARTITIONS
/* DMA stuff, needed for GPMI/MXS NAND support */
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index c5171e0415..e3a4f4bd07 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -211,9 +211,6 @@
#define CONFIG_CLOCKS
#endif
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
/* defines for SPL */
#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \
CONFIG_SYS_MALLOC_LEN)
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 92511193f6..aad7657e94 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -41,8 +41,6 @@
#define CONFIG_BOOTP_BOOTFILESIZE
/* UBI Support for all Keymile boards */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_CONCAT
#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index bd61471799..0816fae365 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -77,8 +77,6 @@
#define CONFIG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) }
/* MTD support */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
/* USB Configs */
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index a6fdb1c11d..0cad187a3c 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -72,9 +72,6 @@
/* commands to include */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-
#define CONFIG_SYS_I2C
/* RTC */
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index d6a0f5aa9d..9624fc5ee8 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -132,17 +132,8 @@
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#if defined(CONFIG_CMD_JFFS2)
-# define CONFIG_MTD_PARTITIONS
-#endif
-
-#if defined(CONFIG_CMD_UBI)
-# define CONFIG_MTD_PARTITIONS
-#endif
-
#if defined(CONFIG_MTD_PARTITIONS)
/* MTD partitions */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
/* default mtd partition table */
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index dc4db2bec8..c060d56328 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -56,10 +56,6 @@
#endif
/* UBI and NAND partitioning */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#endif
/* FEC Ethernet on SoC */
#ifdef CONFIG_CMD_NET
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index ad5fe82dfc..49d923b8eb 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -120,9 +120,7 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_MTD_PARTITIONS
/*
* FLASH and environment organization
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index b9449a4a40..b37705e26e 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -94,8 +94,6 @@
*/
#define CONFIG_JFFS2_NAND
#define CONFIG_JFFS2_LZO
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* SATA
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 70bb5b6c2d..40e735101b 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -147,8 +147,6 @@
#ifdef ONENAND_SUPPORT
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 2f90439383..1ca9a01754 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -22,8 +22,6 @@
#define CONFIG_BZIP2
/* commands configuration */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index bbc860dfc0..1599b6f0ba 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -48,7 +48,6 @@
#define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR 0x260000
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
/* NAND: SPL falcon mode configs */
#if defined(CONFIG_SPL_OS_BOOT)
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 41c0579567..34418309cb 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -55,7 +55,6 @@
#define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR 0x260000
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
/* NAND: SPL falcon mode configs */
#if defined(CONFIG_SPL_OS_BOOT)
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 0ea1490819..4254330ee2 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -91,7 +91,6 @@
#endif
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_SYS_MTDPARTS_RUNTIME
/* OneNAND config */
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 7b8f402e14..4d811e096c 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -65,8 +65,6 @@
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
#define CONFIG_SYS_NAND_MAX_OOBFREE 2
#define CONFIG_SYS_NAND_MAX_ECCPOS 56
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
#endif
/* Environment information */
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 666ec47284..a3d0e5fcaa 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -40,8 +40,6 @@
/* commands to include */
#ifdef CONFIG_NAND
-#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
-
/* NAND block size is 128 KiB. Synchronize these values with
* overo_nand_partitions in mach-omap2/board-overo.c in Linux:
* xloader 4 * NAND_BLOCK_SIZE = 512 KiB
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index c4e99e08b1..9259282729 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -50,10 +50,6 @@
#define CONFIG_SYS_NAND_PAGE_SIZE 2048
#define CONFIG_SYS_NAND_OOBSIZE 64
-#ifdef CONFIG_NAND
-#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
-#endif
-
#define CONFIG_BOOTCOMMAND \
"run distro_bootcmd; " \
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 85d6b03749..a68c18f625 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -257,11 +257,6 @@
#define CONFIG_CLOCKS
#endif
-#ifdef CONFIG_NAND
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#endif
-
#if !defined(CONFIG_NAND) && \
!defined(CONFIG_SYS_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH)
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index aa5425af02..2b21003b8b 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -23,8 +23,6 @@
/*
* Commands configuration
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 6a6e000ca0..0b9ab72e40 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -69,8 +69,6 @@
/*
* Dynamic MTD Partition support with mtdparts
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
@@ -91,8 +89,6 @@
/*
* Dynamic MTD Partition support with mtdparts
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
@@ -138,8 +134,6 @@
/*
* Dynamic MTD Partition support with mtdparts
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
#endif
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index da5018cad2..2fff006cc2 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -329,8 +329,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Dynamic MTD Partition support with mtdparts
*/
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD
/*
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index b8012b1af3..1885577ce5 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -31,8 +31,6 @@
#define CONFIG_JFFS2_NAND
/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
#endif
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 87bb47383b..6da624af6e 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -61,8 +61,6 @@
/* DMA stuff, needed for GPMI/MXS NAND support */
/* Filesystem support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index dbcda61168..690efd74af 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -60,8 +60,6 @@
/* DMA stuff, needed for GPMI/MXS NAND support */
/* Filesystem support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
/* Various command support */
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 734918a2bb..a780cca592 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -108,8 +108,6 @@
#define CONFIG_PREBOOT
/* MTD/UBI/UBIFS config */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
/*
* Environment configuration
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index a654df6d6f..68d726835c 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -27,8 +27,6 @@
/*
* Commands configuration
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-common.h should be defined after CMD configs since it used them
@@ -73,7 +71,5 @@
/*
* File system
*/
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
#endif /* _CONFIG_POGO_E02_H */
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index e1b2fa28e1..4f24a0e7ef 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -54,8 +54,6 @@
/* SF MTD */
#if defined(CONFIG_SPI_FLASH_MTD) && !defined(CONFIG_SPL_BUILD)
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#else
#undef CONFIG_SPI_FLASH_MTD
#endif
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 4f0b58570c..baa19b0dc3 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -43,9 +43,6 @@
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5000000)
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000)
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
#define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 3a2810522b..acfb2d7014 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -43,9 +43,6 @@
/* our CLE is AD22 */
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ONFI_DETECTION
-
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif
/* PMECC & PMERRLOC */
#define CONFIG_ATMEL_NAND_HWECC
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index dc6375841e..deec71734d 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -22,8 +22,6 @@
* Standard filesystems
*/
#define CONFIG_BZIP2
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/*
* mv-plug-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 470387df8c..97903a08e1 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -61,7 +61,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
-#define CONFIG_MTD_DEVICE
#define CONFIG_SF_DEFAULT_SPEED (75000000)
/* Physical Memory Map */
@@ -198,10 +197,6 @@
/* NAND support */
#ifdef CONFIG_NAND
/* UBI Support */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-#endif
/* Commen environment */
#define CONFIG_PREBOOT
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 23137bd5f8..292da54162 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -86,8 +86,6 @@
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
-#define CONFIG_MTD_DEVICE
-
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
#define CONFIG_AT91_GPIO /* enable the GPIO features */
@@ -133,8 +131,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
/* USB DFU support */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_USB_GADGET_AT91
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 671e4479f5..aa43798c42 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -52,9 +52,6 @@
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index acac4a7108..8ebf6b85fe 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -156,8 +156,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_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif
/* QSPI reference clock */
#ifndef __ASSEMBLY__
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 7edd3b6489..b91b999129 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -82,8 +82,6 @@
/* NAND FLASH Configuration */
#define CONFIG_SYS_NAND_SELF_INIT
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_NAND_FSMC
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_ONFI_DETECTION
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 36b7f288e0..8f0437f824 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -55,7 +55,6 @@
#define CONFIG_SYS_MCFRRTC_BASE 0xFC0A8000
/* spi not partitions */
-#define CONFIG_MTD_DEVICE
#define CONFIG_JFFS2_CMDLINE
#define CONFIG_JFFS2_DEV "nor0"
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 21371f4919..516b5f2d08 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -125,9 +125,6 @@
#define CONFIG_SYS_NAND_MAX_ECCPOS 1664
#define CONFIG_SYS_NAND_ONFI_DETECTION
#define CONFIG_SYS_MAX_NAND_DEVICE 8
-
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif
#ifdef CONFIG_SPL_SPI_SUNXI
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 5ebd5cdef9..a7d3d0822b 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -189,9 +189,6 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-
/* Setup MTD for NAND on the SOM */
#define CONFIG_TAM3517_SETTINGS \
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 061610d4c1..4b596c680a 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -58,7 +58,6 @@
#define CONFIG_ENV_OVERWRITE
/* commands to include */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_SYS_I2C
#define CONFIG_I2C_MULTI_BUS
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index d8cfc3f055..3056f49428 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -104,8 +104,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
/* USB DFU support */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_USB_GADGET_AT91
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 9257e2b0a4..57f27cb90e 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -124,9 +124,6 @@
* mtdparts, both for ease of use in U-Boot and for passing information
* on to the Linux kernel.
*/
-#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND) || defined(CONFIG_NAND_DAVINCI)
-#define CONFIG_MTD_DEVICE /* Required for mtdparts */
-#endif
/*
* Our platforms make use of SPL to initalize the hardware (primarily
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 18a03b3955..116bfaa4d9 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -172,7 +172,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
-#define CONFIG_MTD_PARTITIONS
/* USB Configuration */
#define CONFIG_USB_XHCI_KEYSTONE
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 2470855463..63098387c3 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -165,7 +165,5 @@
#endif /* CONFIG_CMD_NAND */
/* UBI/UBIFS config options */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif /* __CONFIG_H */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 3a2a420127..95c3ea9ce4 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -65,7 +65,6 @@
#define CONFIG_TWL4030_LED
/* Board NAND Info */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
/* to access nand */
@@ -78,8 +77,6 @@
#define CONFIG_SYS_NAND_MAX_ECCPOS 56
/* needed for ubi */
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
/* Environment information (this is the common part) */
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index b631f79df8..31dfd23494 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -25,7 +25,6 @@
#define CONFIG_TIMESTAMP
/* FLASH related */
-#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
diff --git a/include/configs/vct.h b/include/configs/vct.h
index db96d81a2f..0e347a4c18 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -189,10 +189,6 @@ int vct_gpio_get(int pin);
/*
* UBI configuration
*/
-#if defined(CONFIG_VCT_ONENAND)
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
-#endif
/*
* We need a small, stripped down image to fit into the first 128k OneNAND
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index d08d42371c..effae2b0ba 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -37,8 +37,6 @@
#define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR
/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
#endif
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h
index 9e4dee50fd..c9dd3915b0 100644
--- a/include/configs/wb45n.h
+++ b/include/configs/wb45n.h
@@ -55,9 +55,7 @@
#define CONFIG_PMECC_CAP 4
#define CONFIG_PMECC_SECTOR_SIZE 512
-#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_RBTREE
#define CONFIG_LZO
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 7135e1972e..88ee59259c 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -112,9 +112,7 @@
/*
* MTD Command for mtdparts
*/
-#define CONFIG_MTD_DEVICE
#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_MTD_PARTITIONS
/*
* FLASH and environment organization
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 204e019d4f..74f4dfc55d 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -62,8 +62,6 @@
#define CONFIG_NAND_ECC_BCH
/* UBI/UBI config options */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
/* Ethernet config options */
#define CONFIG_MII
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index ef242c7962..b1e44d55c2 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -57,7 +57,6 @@
#ifdef CONFIG_NAND_ARASAN
# define CONFIG_SYS_MAX_NAND_DEVICE 1
# define CONFIG_SYS_NAND_ONFI_DETECTION
-# define CONFIG_MTD_DEVICE
#endif
#if defined(CONFIG_SPL_BUILD)
diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 8ba91d0d1d..e58e9cecab 100644
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -21,7 +21,6 @@
#undef CONFIG_GZIP
#undef CONFIG_CMD_ENV
#undef CONFIG_SYS_INIT_SP_ADDR
-#undef CONFIG_MTD_DEVICE
#undef CONFIG_BOOTM_NETBSD
#undef CONFIG_BOOTM_VXWORKS
#undef CONFIG_BOOTM_LINUX
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index c41dc2c907..096f9d133a 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -65,7 +65,6 @@
#ifdef CONFIG_NAND_ZYNQ
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_MTD_DEVICE
#endif
#ifdef CONFIG_USB_EHCI_ZYNQ