]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
mtd: MTD related config header changes (mtdparts command)
authorStefan Roese <sr@denx.de>
Tue, 12 May 2009 12:32:58 +0000 (14:32 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Jun 2009 18:45:47 +0000 (20:45 +0200)
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: Stefan 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>
35 files changed:
include/configs/BC3450.h
include/configs/FPS850L.h
include/configs/FPS860L.h
include/configs/SIMPC8313.h
include/configs/TB5200.h
include/configs/TQM5200.h
include/configs/TQM823L.h
include/configs/TQM823M.h
include/configs/TQM834x.h
include/configs/TQM850L.h
include/configs/TQM850M.h
include/configs/TQM855L.h
include/configs/TQM855M.h
include/configs/TQM85xx.h
include/configs/TQM860L.h
include/configs/TQM860M.h
include/configs/TQM862L.h
include/configs/TQM862M.h
include/configs/TQM866M.h
include/configs/apollon.h
include/configs/cm5200.h
include/configs/fx12mm.h
include/configs/idmr.h
include/configs/microblaze-generic.h
include/configs/motionpro.h
include/configs/mx1fs2.h
include/configs/netstar.h
include/configs/omap3_beagle.h
include/configs/qong.h
include/configs/smmaco4.h
include/configs/trab.h
include/configs/vct.h
include/configs/virtlab2.h
include/configs/voiceblue.h
include/configs/xilinx-ppc.h

index 9934f29b7faaf62d346f94c433bb0486c92dc8da..8c5a742290ecd5b9bdd1e2c3de0f6d0ddc847ce1 100644 (file)
 
 /* 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),"        \
index f152230da72eb2fa4f3894197fcc223fdfc201b0..aceecd86d44a295def1bd81ce46668afef3a85e4 100644 (file)
  * 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),"      \
index 5eaed842bf73aea990ee61b012f6e155eb647cfa..4a61d7c759400ed19946f0e24661d2a783532312 100644 (file)
  * 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),"      \
index 88ea7c7c93bee261cecad0546abd07f06777549f..8d1e95b55392ee238d62670bb850ce8d03f79730 100644 (file)
 
 /* 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)"
 
index 92b4fa503efedda4ca4a79ad84ce84ee524092be..3438abaeaae0e3ec16cc5f251b5720f169f92b2c 100644 (file)
 
 /* 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),"    \
index fe1d10290be44d4932b4c24a21cf2766c0f612ec..a4336a750044fe239d58487cecbb988d8c905e67 100644 (file)
 
 /* 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
index 87e5a650d223a4df5c146d1ce846a7b5733498a4..1f816f35a1349284e87a382b4289771aed9d4ffa 100644 (file)
  * 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),"      \
index f6664437d36e420a4d23498bdf5d41e3256e06cf..42dcbfc2a31ae0c705f2b10de2d893d79cb21607 100644 (file)
  * 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),"      \
index dbd30ac4b0f95f78747efa25338e74c2924da3ee..70f222ca0f58997ed89b7b915a044e54f612de79 100644 (file)
@@ -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 */
index dc80b4746d4636fb960f9754061e9a7fc6ca1175..290e211ad1778bfd7e6ecc01807f23a8a3e101e0 100644 (file)
  * 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),"      \
index 22894432cbd278b36fd22c4a69ad9d1cb7ca5de7..2170df5dcb11617fa64b2efd3d68b6361c1943d1 100644 (file)
  * 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),"      \
index 999bdaadcb674a842502475c9445c9f9ed05b19b..3d7dc4233bb00f9d1a263a7a1c06817ea00610cc 100644 (file)
  * 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),"      \
index b54967dae781d169bd0e9bc1d54295325132a4fe..35cfa08822765ea32c26cf5e869976cccf485aac 100644 (file)
  * 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),"      \
index 08465010e04f6d3ca618cb60221b6fd2c1b147e8..6f13c63f5c92707243da02b1384280acab41c276 100644 (file)
 #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
index 2e2a165b8a5f64187951c34c8b467f361ae3e582..4ac485d3215b8ad5530ee3fc5ec5af62c78eebce 100644 (file)
  * 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),"      \
index 1148f2e4efbcf5de5595a8beb89ff1334e3793f6..39da0bbd6ed4c58ca6b72cb5b5ce5db1e0416977 100644 (file)
  * 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),"      \
index 577f982c5a312e614c32b6702935ef99f70fc175..1f79b170dbe90b0c328ed88f3c4c967a04a6eefd 100644 (file)
  * 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),"      \
index 69070e64597fb2d1f562e2149065c77e56f136c0..86d5b016365a2375df4a508aece27a7f12e437ce 100644 (file)
  * 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),"      \
index bb6861470ff849cfef939b2538573688c32dcce0..04f538ce517d09246627ebc7082c4d9e6dc54c55 100644 (file)
  * 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),"      \
index 925079d0c47d70ec52c6d0c88b0f10c874e01c30..fa5a7a9e22dc505964041be719bebd3261080a5b 100644 (file)
 #define        CONFIG_CMD_JFFS2
 #define        CONFIG_CMD_UBI
 #define        CONFIG_RBTREE
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #endif
 
index 54cf40d67fc52a9611ffedd15f55b169f5b08401..72cf941ab55c2082e13235b8e5eee6875d353f6d 100644 (file)
  * 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),"        \
index 27c6e7d4a7ddecc14e557fa062aec15d3b155b0d..e825c2150173d5d2ab8dafa90e4f8ed2ed8d7ea4 100644 (file)
@@ -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 */
index 944d06fbfc08a590b0639cd4a51e5d4d0c6dc115..841affb7ccea71e6c931ac494598b9cdc0783b40 100644 (file)
 
 /* 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)," \
index aa117c8f7136c2cabdfe3eb27a8c88c99cbb7077..72715f6ed9d6b4b356887ea73b2722973ec57653 100644 (file)
 #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 */
index 99a02cc2234f7d61bde3b563a6b16aa03d09e002..fa4310b79febf315c23b0bc294b88ccbb473a70d 100644 (file)
  * 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)," \
index 24fa144ec668bb789932676a66ba8a278e768fc6..90a8d8405b503fec999f866b1086f4aface3516a 100644 (file)
 /* 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
index 5cfee66229bcccada6e16d0ea4bb9ec8a8914a3e..5062cdb167c6c2a6c8a687a5d24b4c6d53c4f259 100644 (file)
  * 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);" \
index a3d9cf69454ee4a62ef091f2221542f6348a7828..c2bd7e67e30e1c459b895f6ef886307d1f80924e 100644 (file)
 #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),"\
index a67006aa2d663057566ddb9566fab90d17b32f36..7e6718503ee9d3673c64ad9233cfa462989c6e63 100644 (file)
  * 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),"     \
index 35f3e3a022317f93879647ca71877d615a28c920..5a2ef3aa8c3ea460d633fb8e92d3735885d54344 100644 (file)
 
 /* 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),"        \
index 51ad3cadaf699d68c7aeb6fd2f05482fefb5f28b..7687ee6dcbae6aeaf0151f9b4ecc605226795525 100644 (file)
 
 /* 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 */
index fe679974c0c15de06c3c26b985183430844a4975..e72b504549460a603723a92e1c2d5a643a534bc6 100644 (file)
@@ -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
 
index 021012d0f952aa615e74ce5d28b3f60fa421296d..9ebafcccbca4ca35177eefca0248e8acc65705f5 100644 (file)
  * 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),"      \
index aa8efaad5ade4eaea528ffa9b35a83490121f8dc..c9c3132355389d02ee5a49f7409a29bc5134288c 100644 (file)
  * 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)"
 
index e3ea84b31592d7489c72ac7370cad9167c9b0c14..6efe3421fc080549fc2299158981999444286888 100644 (file)
 #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