diff options
35 files changed, 66 insertions, 0 deletions
| diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 9934f29b7..8c5a74229 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -347,6 +347,8 @@  /* Dynamic MTD partition support */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM5200-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM5200-0:640k(firmware),"	\  						"1408k(kernel),"	\ diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index f152230da..aceecd86d 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -217,6 +217,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index 5eaed842b..4a61d7c75 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -217,6 +217,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index 88ea7c7c9..8d1e95b55 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -190,6 +190,7 @@  /* mtdparts command line support */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */  #define MTDIDS_DEFAULT		"nand0=nand0"  #define MTDPARTS_DEFAULT	"mtdparts=nand0:2M(u-boot),6M(kernel),-(jffs2)" diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 92b4fa503..3438abaea 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -276,6 +276,8 @@  /* Dynamic MTD partition support */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM5200-0"  #if defined(CONFIG_TQM5200_B)  #define MTDPARTS_DEFAULT	"mtdparts=TQM5200-0:768k(firmware),"	\ diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index fe1d10290..a4336a750 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -408,6 +408,8 @@  /* Dynamic MTD partition support */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM5200-0"  #ifdef CONFIG_STK52XX diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 87e5a650d..1f816f35a 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -232,6 +232,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index f6664437d..42dcbfc2a 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -228,6 +228,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index dbd30ac4b..70f222ca0 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -534,6 +534,8 @@ extern int tqm834x_num_flash_banks;   */  /* 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"  /* default mtd partition table */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index dc80b4746..290e211ad 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -217,6 +217,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 22894432c..2170df5dc 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -217,6 +217,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 999bdaadc..3d7dc4233 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -222,6 +222,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index b54967dae..35cfa0882 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -257,6 +257,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\ diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index 08465010e..6f13c63f5 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -567,6 +567,8 @@  #define	CONFIG_JFFS2_NAND	1  #ifdef CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nand0=TQM85xx-nand"  #define MTDPARTS_DEFAULT	"mtdparts=TQM85xx-nand:-"  #else diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 2e2a165b8..4ac485d32 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -221,6 +221,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 1148f2e4e..39da0bbd6 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -222,6 +222,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 577f982c5..1f79b170d 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -225,6 +225,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 69070e645..86d5b0163 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -226,6 +226,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\ diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index bb6861470..04f538ce5 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -266,6 +266,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\ diff --git a/include/configs/apollon.h b/include/configs/apollon.h index 925079d0c..fa5a7a9e2 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -124,6 +124,7 @@  #define	CONFIG_CMD_JFFS2  #define	CONFIG_CMD_UBI  #define	CONFIG_RBTREE +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */  #define CONFIG_MTD_PARTITIONS  #endif diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 54cf40d67..72cf941ab 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -223,6 +223,8 @@   * MTD configuration   */  #define CONFIG_CMD_MTDPARTS	1 +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=cm5200-0"  #define MTDPARTS_DEFAULT	"mtdparts=cm5200-0:"			\  					"384k(uboot),128k(env),"	\ diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h index 27c6e7d4a..e825c2150 100644 --- a/include/configs/fx12mm.h +++ b/include/configs/fx12mm.h @@ -38,6 +38,8 @@  /* cmd config */  #define CONFIG_CMD_JFFS2  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #undef CONFIG_CMD_NET  /* sdram */ diff --git a/include/configs/idmr.h b/include/configs/idmr.h index 944d06fbf..841affb7c 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -230,6 +230,8 @@  /* Dynamic MTD partition support */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=idmr-0"  #define MTDPARTS_DEFAULT	"mtdparts=idmr-0:128k(u-boot),"	\ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index aa117c8f7..72715f6ed 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -260,6 +260,8 @@  #if defined(CONFIG_CMD_JFFS2)  /* JFFS2 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=ml401-0"  /* default mtd partition table */ diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 99a02cc22..fa4310b79 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -276,6 +276,8 @@   * MTD configuration   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=motionpro-0"  #define MTDPARTS_DEFAULT	"mtdparts=motionpro-0:"			  \  					"13m(fs),2m(kernel),256k(uboot)," \ diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h index 24fa144ec..90a8d8405 100644 --- a/include/configs/mx1fs2.h +++ b/include/configs/mx1fs2.h @@ -183,6 +183,8 @@  /* mtdparts command line support */  /* Note: fake mtd_id used, no linux mtd map file */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=mx1fs2-0"  #ifdef BUS32BIT_VERSION diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 5cfee6622..5062cdb16 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -130,6 +130,8 @@   * 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=omapflash.0,nand0=omapnand.0"  #define MTDPARTS_DEFAULT	"mtdparts=" \  	"omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);" \ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a3d9cf694..c2bd7e67e 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -105,6 +105,7 @@  #define CONFIG_CMD_FAT		/* FAT support			*/  #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/  #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),"\  					"1920k(u-boot),128k(u-boot-env),"\ diff --git a/include/configs/qong.h b/include/configs/qong.h index a67006aa2..7e6718503 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -213,6 +213,8 @@   * JFFS2 partitions   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=physmap-flash.0"  #define MTDPARTS_DEFAULT	\  	"mtdparts=physmap-flash.0:256k(U-Boot),128k(env1),"	\ diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h index 35f3e3a02..5a2ef3aa8 100644 --- a/include/configs/smmaco4.h +++ b/include/configs/smmaco4.h @@ -215,6 +215,8 @@  /* Dynamic MTD partition support */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM5200-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM5200-0:640k(firmware),"	\  						"1408k(kernel),"	\ diff --git a/include/configs/trab.h b/include/configs/trab.h index 51ad3cada..7687ee6dc 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -375,6 +375,8 @@  /* Dynamic MTD partition support */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=0"  /* production flash layout */ diff --git a/include/configs/vct.h b/include/configs/vct.h index fe679974c..e72b50454 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -296,6 +296,7 @@ int vct_gpio_get(int pin);  #define	CONFIG_CMD_JFFS2  #define	CONFIG_CMD_UBI  #define	CONFIG_RBTREE +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */  #define CONFIG_MTD_PARTITIONS  #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 021012d0f..9ebafcccb 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -226,6 +226,8 @@   * Dynamic MTD partition support   */  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"  #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\ diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h index aa8efaad5..c9c313235 100644 --- a/include/configs/voiceblue.h +++ b/include/configs/voiceblue.h @@ -190,6 +190,8 @@   * 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=omapflash.0"  #define MTDPARTS_DEFAULT	"mtdparts=omapflash.0:256k(u-boot),64k(env),64k(r_env),16192k(data0),-(data1)" diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index e3ea84b31..6efe3421f 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -109,6 +109,8 @@  #define	CONFIG_SYS_FLASH_PROTECTION  #define CONFIG_CMD_JFFS2  #define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */ +#define CONFIG_FLASH_CFI_MTD  #else  #define CONFIG_ENV_IS_NOWHERE  #define CONFIG_SYS_NO_FLASH |