Skip to content
Snippets Groups Projects
Commit 942556a9 authored by Stefan Roese's avatar Stefan Roese Committed by Wolfgang Denk
Browse files

mtd: MTD related config header changes (mtdparts command)


By changing the cmd_mtdparts to only use the MTD infrastructure and
not the direct interface to the CFI NOR FLASH driver we now need
to add the MTD infrastructure to all boards using those mtdparts
commands. This patch adds those components:

CONFIG_MTD_DEVICE (for all FLASH types)

plus

CONFIG_FLASH_CFI_MTD (for NOR FLASH)

To all board maintainers: Please test this on your platforms and
report any problems/issues found. Thanks.

Signed-off-by: default avatarStefan Roese <sr@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Ron Madrid <info@sheldoninst.com>
Cc: Georg Schardt <schardt@team-ctech.de>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ladislav Michl <ladis@linux-mips.org>
Cc: Martin Krause <martin.krause@tqs.de>
Cc: Gary Jennejohn <garyj@denx.de>
Cc: Ricardo Ribalda <ricardo.ribalda@uam.es>
parent 8d2effea
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 0 deletions
...@@ -347,6 +347,8 @@ ...@@ -347,6 +347,8 @@
/* Dynamic MTD partition support */ /* Dynamic MTD partition support */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM5200-0" #define MTDIDS_DEFAULT "nor0=TQM5200-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \
"1408k(kernel)," \ "1408k(kernel)," \
......
...@@ -217,6 +217,8 @@ ...@@ -217,6 +217,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
......
...@@ -217,6 +217,8 @@ ...@@ -217,6 +217,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
......
...@@ -190,6 +190,7 @@ ...@@ -190,6 +190,7 @@
/* mtdparts command line support */ /* mtdparts command line support */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define MTDIDS_DEFAULT "nand0=nand0" #define MTDIDS_DEFAULT "nand0=nand0"
#define MTDPARTS_DEFAULT "mtdparts=nand0:2M(u-boot),6M(kernel),-(jffs2)" #define MTDPARTS_DEFAULT "mtdparts=nand0:2M(u-boot),6M(kernel),-(jffs2)"
......
...@@ -276,6 +276,8 @@ ...@@ -276,6 +276,8 @@
/* Dynamic MTD partition support */ /* Dynamic MTD partition support */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM5200-0" #define MTDIDS_DEFAULT "nor0=TQM5200-0"
#if defined(CONFIG_TQM5200_B) #if defined(CONFIG_TQM5200_B)
#define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:768k(firmware)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:768k(firmware)," \
......
...@@ -408,6 +408,8 @@ ...@@ -408,6 +408,8 @@
/* Dynamic MTD partition support */ /* Dynamic MTD partition support */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM5200-0" #define MTDIDS_DEFAULT "nor0=TQM5200-0"
#ifdef CONFIG_STK52XX #ifdef CONFIG_STK52XX
......
...@@ -232,6 +232,8 @@ ...@@ -232,6 +232,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
......
...@@ -228,6 +228,8 @@ ...@@ -228,6 +228,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxM-0" #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
......
...@@ -534,6 +534,8 @@ extern int tqm834x_num_flash_banks; ...@@ -534,6 +534,8 @@ extern int tqm834x_num_flash_banks;
*/ */
/* mtdparts command line support */ /* mtdparts command line support */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM834x-0" #define MTDIDS_DEFAULT "nor0=TQM834x-0"
/* default mtd partition table */ /* default mtd partition table */
......
...@@ -217,6 +217,8 @@ ...@@ -217,6 +217,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
......
...@@ -217,6 +217,8 @@ ...@@ -217,6 +217,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxM-0" #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
......
...@@ -222,6 +222,8 @@ ...@@ -222,6 +222,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
......
...@@ -257,6 +257,8 @@ ...@@ -257,6 +257,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxM-0" #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
......
...@@ -567,6 +567,8 @@ ...@@ -567,6 +567,8 @@
#define CONFIG_JFFS2_NAND 1 #define CONFIG_JFFS2_NAND 1
#ifdef CONFIG_CMD_MTDPARTS #ifdef CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nand0=TQM85xx-nand" #define MTDIDS_DEFAULT "nand0=TQM85xx-nand"
#define MTDPARTS_DEFAULT "mtdparts=TQM85xx-nand:-" #define MTDPARTS_DEFAULT "mtdparts=TQM85xx-nand:-"
#else #else
......
...@@ -221,6 +221,8 @@ ...@@ -221,6 +221,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
......
...@@ -222,6 +222,8 @@ ...@@ -222,6 +222,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxM-0" #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
......
...@@ -225,6 +225,8 @@ ...@@ -225,6 +225,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDIDS_DEFAULT "nor0=TQM8xxL-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \
......
...@@ -226,6 +226,8 @@ ...@@ -226,6 +226,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxM-0" #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
......
...@@ -266,6 +266,8 @@ ...@@ -266,6 +266,8 @@
* Dynamic MTD partition support * Dynamic MTD partition support
*/ */
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=TQM8xxM-0" #define MTDIDS_DEFAULT "nor0=TQM8xxM-0"
#define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \ #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \
......
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_JFFS2
#define CONFIG_CMD_UBI #define CONFIG_CMD_UBI
#define CONFIG_RBTREE #define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_PARTITIONS
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment