diff options
| author | Stefan Roese <sr@denx.de> | 2009-03-19 13:30:36 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-20 22:39:14 +0100 |
| commit | 68d7d65100e84df00bca971c114092731b441090 (patch) | |
| tree | 9114e5a08f2eb749117196cc10585a717996d0da /include | |
| parent | 02a301cd5087eaffdf456e0a5cec1100c4d9a398 (diff) | |
Separate mtdparts command from jffs2
Currently the mtdparts commands are included in the jffs2 command support.
This doesn't make sense anymore since other commands (e.g. UBI) use this
infrastructure as well now. This patch separates the mtdparts commands from
the jffs2 commands making it possible to only select mtdparts when no JFFS2
support is needed.
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'include')
74 files changed, 112 insertions, 111 deletions
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 205dd1f6594..db1f55c84a0 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -58,6 +58,7 @@ #define CONFIG_CMD_MII /* MII support */ #define CONFIG_CMD_MISC /* Misc functions like sleep etc*/ #define CONFIG_CMD_MMC /* MMC support */ +#define CONFIG_CMD_MTDPARTS /* mtd parts support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */ diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h index e61a3e1095f..0977bee35d8 100644 --- a/include/configs/ADNPESC1.h +++ b/include/configs/ADNPESC1.h @@ -673,14 +673,14 @@ * */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 2581fdfefd8..576aa740625 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -320,7 +320,7 @@ /* No command line, one static partition */ /* -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0x00400000 #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -328,7 +328,7 @@ /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=alaska-0" #define MTDPARTS_DEFAULT "mtdparts=alaska-0:4m(user)" */ diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index 1910b34639e..40a1c40cc4a 100644 --- a/include/configs/BAB7xx.h +++ b/include/configs/BAB7xx.h @@ -219,7 +219,7 @@ * */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -229,7 +229,7 @@ * Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=bab7xx-0" #define MTDPARTS_DEFAULT "mtdparts=bab7xx-0:-(jffs2)" */ diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index bced118e385..9934f29b7fa 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -346,7 +346,7 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ /* Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=TQM5200-0" #define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \ "1408k(kernel)," \ diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index fa9fc23823d..39f41e6a2dc 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -781,7 +781,7 @@ * */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nand" #define CONFIG_JFFS2_PART_SIZE 0x00200000 #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -791,7 +791,7 @@ * Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nand0=catcenter" #define MTDPARTS_DEFAULT "mtdparts=catcenter:2m(nand)" */ diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index daed9342b37..160871b24e2 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -230,7 +230,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor1" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -242,7 +242,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" * Note: fake mtd_id's used, no linux mtd map file. */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor1=db64360-1" #define MTDPARTS_DEFAULT "mtdparts=db64360-1:-(jffs2)" */ diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index 604fd45af7d..06fd157ad22 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -168,7 +168,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor1" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -180,7 +180,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" * Note: fake mtd_id's used, no linux mtd map file. */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor1=db64460-1" #define MTDPARTS_DEFAULT "mtdparts=db64460-1:-(jffs2)" */ diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h index 6fdc5660023..db9c17df913 100644 --- a/include/configs/DK1C20.h +++ b/include/configs/DK1C20.h @@ -539,14 +539,14 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h index 1d031f1cde7..3bd270cdf28 100644 --- a/include/configs/DK1S10.h +++ b/include/configs/DK1S10.h @@ -545,14 +545,14 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index 79392668e07..d2aa8b92e47 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -196,7 +196,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -204,7 +204,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=elppc-0,nor1=elppc-1" #define MTDPARTS_DEFAULT "mtdparts=elppc-0:-(jffs2),elppc-1:-(user)" */ diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index 08408e2c312..f152230da72 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -216,7 +216,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 e5f3b606edf..5eaed842bf7 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -216,7 +216,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=TQM8xxL-0" #define MTDPARTS_DEFAULT "mtdparts=TQM8xxL-0:256k(u-boot)," \ diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index f14d9455d72..6e8a4b80854 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -352,14 +352,14 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h index 8e7f9cdc140..19a288c5820 100644 --- a/include/configs/MHPC.h +++ b/include/configs/MHPC.h @@ -200,7 +200,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -208,7 +208,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=mhpc-0" #define MTDPARTS_DEFAULT "mtdparts=mhpc-0:-(jffs2)" */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index c58ce053fd1..a3869c8747b 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -243,7 +243,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -251,7 +251,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=mip405-0" #define MTDPARTS_DEFAULT "mtdparts=mip405-0:-(jffs2)" */ diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 19023973253..5fcc1733bc3 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -249,7 +249,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00080000 @@ -257,7 +257,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=ml2-0" #define MTDPARTS_DEFAULT "mtdparts=ml2-0:-@512k(jffs2)" */ diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index fe1cc17960a..4fd86d3923f 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -563,14 +563,14 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 0b97f0ce666..6343cfed1f2 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -440,13 +440,13 @@ */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_PART_SIZE 0x00400000 #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=nc650-0,nand0=nc650-nand" #define MTDPARTS_DEFAULT "mtdparts=nc650-0:1m(kernel1),1m(kernel2)," \ diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 34fdba59c0a..724e8073981 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -702,7 +702,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_PART_SIZE 0x00100000 #define CONFIG_JFFS2_PART_OFFSET 0x00200000 @@ -710,7 +710,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nand0=netta-nand" #define MTDPARTS_DEFAULT "mtdparts=netta-nand:1m@2m(jffs2)" */ diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index d2eae1d7fad..16baf8c9be7 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -804,14 +804,14 @@ */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_PART_SIZE 0x00400000 #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=PPChameleon-0,nand0=ppchameleonevb-nand" */ diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index bab44606da6..830f4bc59b4 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -167,14 +167,14 @@ */ /* No command line, one static partition * use all the space starting at offset 3MB*/ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00300000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=r360-0" #define MTDPARTS_DEFAULT "mtdparts=r360-0:-@3m(user)" */ diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 280175af1a4..f36244d12c8 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -429,7 +429,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -437,7 +437,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index 01d0d5fc3bd..5b6f27186bf 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -202,7 +202,7 @@ * */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00100000 @@ -210,7 +210,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=rattler-0" #define MTDPARTS_DEFAULT "mtdparts=rattler-0:-@1m(jffs2)" */ diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index b939cfa79f5..e20527e4f91 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -189,7 +189,7 @@ #define CONFIG_JFFS2_DEV "nand0" /* mtdparts command line support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nand0=nand0" #define MTDPARTS_DEFAULT "mtdparts=nand0:2M(u-boot),6M(kernel),-(jffs2)" diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index 9857bf605ce..cac04b4017a 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -174,7 +174,7 @@ * */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS /* #define CONFIG_JFFS2_DEV "nor0" @@ -189,7 +189,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=sixnet-0,nand0=sixnet-nand" #define MTDPARTS_DEFAULT "mtdparts=sixnet-0:7680k@512k();sixnet-nand:2m(jffs2-nand)" */ diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index b42d3d944d9..92b4fa503ef 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -275,7 +275,7 @@ (= chip selects) */ /* Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 6850eba15dd..d374981abc4 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -407,7 +407,7 @@ #endif /* Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=TQM5200-0" #ifdef CONFIG_STK52XX diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 8934d51bfad..87e5a650d22 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -231,7 +231,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 fd4157343c0..f6664437d36 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -227,7 +227,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 e126dc38cb1..b74b4046a51 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -537,7 +537,7 @@ extern int tqm834x_num_flash_banks; * JFFS2 partitions */ /* mtdparts command line support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=TQM834x-0" /* default mtd partition table */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 77eb5a96dcc..dc80b4746d4 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -216,7 +216,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 bb8825b9e96..22894432cbd 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -216,7 +216,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 2ccbaf8952a..999bdaadcb6 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -221,7 +221,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 8a651835839..b54967dae78 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -256,7 +256,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 3b2272c231e..72db26c7b13 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -597,14 +597,14 @@ #define CONFIG_JFFS2_NAND 1 -#ifdef CONFIG_JFFS2_CMDLINE +#ifdef CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nand0=TQM85xx-nand" #define MTDPARTS_DEFAULT "mtdparts=TQM85xx-nand:-" #else #define CONFIG_JFFS2_DEV "nand0" /* NAND device jffs2 lives on */ #define CONFIG_JFFS2_PART_OFFSET 0 /* start of jffs2 partition */ #define CONFIG_JFFS2_PART_SIZE 0x200000 /* size of jffs2 partition */ -#endif /* CONFIG_JFFS2_CMDLINE */ +#endif /* CONFIG_CMD_MTDPARTS */ #endif /* CONFIG_NAND */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 8bd1fe062a1..2e2a165b8a5 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -220,7 +220,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 ad2c71ce03d..1148f2e4efb 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -221,7 +221,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 0a5180e4f36..577f982c5a3 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -224,7 +224,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 ee6980c81d0..69070e64597 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -225,7 +225,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 421a2d86891..bb6861470ff 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -265,7 +265,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=TQM8xxM-0" #define MTDPARTS_DEFAULT "mtdparts=TQM8xxM-0:512k(u-boot)," \ diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index 08c4ced1c98..b73aaa817b4 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -130,7 +130,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -138,7 +138,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor1=zuma-1,nor2=zuma-2" #define MTDPARTS_DEFAULT "mtdparts=zuma-1:-(jffs2),zuma-2:-(user)" */ diff --git a/include/configs/apollon.h b/include/configs/apollon.h index dff47fc6a6c..f83dd9c2434 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -258,7 +258,7 @@ #define CONFIG_ENV_ADDR 0x00020000 #ifdef CONFIG_SYS_USE_UBI -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "onenand0=onenand" #define MTDPARTS_DEFAULT "mtdparts=onenand:128k(bootloader)," \ "128k(params)," \ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index ddcc6aad465..54cf40d67fc 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -222,7 +222,7 @@ /* * MTD configuration */ -#define CONFIG_JFFS2_CMDLINE 1 +#define CONFIG_CMD_MTDPARTS 1 #define MTDIDS_DEFAULT "nor0=cm5200-0" #define MTDPARTS_DEFAULT "mtdparts=cm5200-0:" \ "384k(uboot),128k(env)," \ diff --git a/include/configs/debris.h b/include/configs/debris.h index 4d65f6a44be..dc59df9c442 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -234,7 +234,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -246,7 +246,7 @@ * Note: fake mtd_id's used, no linux mtd map file. */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=debris-0" #define MTDPARTS_DEFAULT "mtdparts=debris-0:-(jffs2)" */ diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h index 0581842ec22..322a3ca41ac 100644 --- a/include/configs/ep7312.h +++ b/include/configs/ep7312.h @@ -158,7 +158,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -166,7 +166,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=ep7312-0" #define MTDPARTS_DEFAULT "mtdparts=ep7312-0:-(jffs2)" */ diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index d49d02f2872..3f4425abc80 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -758,7 +758,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -766,7 +766,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h index 58445674c35..27c6e7d4a7d 100644 --- a/include/configs/fx12mm.h +++ b/include/configs/fx12mm.h @@ -37,7 +37,7 @@ /* cmd config */ #define CONFIG_CMD_JFFS2 -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #undef CONFIG_CMD_NET /* sdram */ diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 0fdcda23017..2dacfb6e074 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -730,14 +730,14 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "" #define MTDPARTS_DEFAULT "" */ diff --git a/include/configs/idmr.h b/include/configs/idmr.h index 1dd89f90c7b..944d06fbfc0 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -229,7 +229,7 @@ /* Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=idmr-0" #define MTDPARTS_DEFAULT "mtdparts=idmr-0:128k(u-boot)," \ diff --git a/include/configs/impa7.h b/include/configs/impa7.h index bb3c02e72a2..a3d023f630f 100644 --- a/include/configs/impa7.h +++ b/include/configs/impa7.h @@ -160,14 +160,14 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00020000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=impA7 NOR Flash Bank #0,nor1=impA7 NOR Flash Bank #1" #define MTDPARTS_DEFAULT "mtdparts=impA7 NOR Flash Bank #0:-(FileSystem1);impA7 NOR Flash Bank #1:-(FileSystem2)" */ diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 6c150aed399..9ac6eec3b45 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -170,7 +170,7 @@ /* * JFFS2 partitions */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #endif /* __CONFIG_H */ diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 2dd9e92f878..cbc0b9259a4 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -175,7 +175,7 @@ /* * JFFS2 partitions */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" /* EET platform additions */ diff --git a/include/configs/incaip.h b/include/configs/incaip.h index a18ba801925..2129dfd804c 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -168,14 +168,14 @@ * JFFS2 partitions */ /* No command line, one static partition, use all space on the device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor1" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=INCA-IP Bank 0" #define MTDPARTS_DEFAULT "mtdparts=INCA-IP Bank 0:192k(uboot)," \ "64k(env)," \ diff --git a/include/configs/innokom.h b/include/configs/innokom.h index d9b155548a7..043ae2f364a 100644 --- a/include/configs/innokom.h +++ b/include/configs/innokom.h @@ -203,7 +203,7 @@ */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -211,7 +211,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=innokom-0" */ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index ac18c8776dd..aa117c8f713 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -259,7 +259,7 @@ #if defined(CONFIG_CMD_JFFS2) /* JFFS2 partitions */ -#define CONFIG_JFFS2_CMDLINE /* mtdparts command line support */ +#define CONFIG_CMD_MTDPARTS /* mtdparts command line support */ #define MTDIDS_DEFAULT "nor0=ml401-0" /* default mtd partition table */ diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h index c4f52868804..27213a8d8db 100644 --- a/include/configs/modnet50.h +++ b/include/configs/modnet50.h @@ -182,7 +182,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00080000 @@ -190,7 +190,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=modnet50-0" #define MTDPARTS_DEFAULT "mtdparts=modnet50-0:-@512k(jffs2)" */ diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index e6e3729a20d..99a02cc2234 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -275,7 +275,7 @@ /* * MTD configuration */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 aaa4e985220..a19eb78409e 100644 --- a/include/configs/mx1fs2.h +++ b/include/configs/mx1fs2.h @@ -176,7 +176,7 @@ */ /* No command line, one static partition, whole device */ /* -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00050000 @@ -184,7 +184,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=mx1fs2-0" #ifdef BUS32BIT_VERSION diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 1649f1fa85d..c31c06acc42 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -194,7 +194,7 @@ /* * JFFS2 partitions */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #endif /* __CONFIG_H */ diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 3b22e48d8db..0b38549dff0 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -121,7 +121,7 @@ /* * partitions (mtdparts command line support) */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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/omap2420h4.h b/include/configs/omap2420h4.h index 92df0b4fdc8..983b5f25172 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -296,7 +296,7 @@ * JFFS2 partitions */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor1" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -304,7 +304,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor1=omap2420-1" #define MTDPARTS_DEFAULT "mtdparts=omap2420-1:-(jffs2)" */ diff --git a/include/configs/qong.h b/include/configs/qong.h index ccc2625135f..a67006aa2d6 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -212,7 +212,7 @@ /* * JFFS2 partitions */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=physmap-flash.0" #define MTDPARTS_DEFAULT \ "mtdparts=physmap-flash.0:256k(U-Boot),128k(env1)," \ diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 515b09789e7..5b68ef9875b 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -430,7 +430,7 @@ extern unsigned long offsetOfEnvironment; #define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ /* No command line, one static partition */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_PART_SIZE 0x01000000 #define CONFIG_JFFS2_PART_OFFSET 0x00000000 diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h index 82faca81003..960350c6c60 100644 --- a/include/configs/sc520_cdp.h +++ b/include/configs/sc520_cdp.h @@ -159,14 +159,14 @@ * JFFS2 partitions */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 /* mtdparts command line support */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=SC520CDP Flash Bank #0" #define MTDPARTS_DEFAULT "mtdparts=SC520CDP Flash Bank #0:-(jffs2)" */ diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h index 36441696ad5..2445a341689 100644 --- a/include/configs/sc520_spunk.h +++ b/include/configs/sc520_spunk.h @@ -177,7 +177,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -185,7 +185,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=sc520_spunk-0" #define MTDPARTS_DEFAULT "mtdparts=sc520_spunk-0:-(jffs2)" */ diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h index a3f26773870..35f3e3a0223 100644 --- a/include/configs/smmaco4.h +++ b/include/configs/smmaco4.h @@ -214,7 +214,7 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ /* Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 0a7a73d30c4..8f13c35614c 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -375,7 +375,7 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=0" /* production flash layout */ diff --git a/include/configs/v37.h b/include/configs/v37.h index a6b0f0daf06..7f1670eafe7 100644 --- a/include/configs/v37.h +++ b/include/configs/v37.h @@ -106,7 +106,7 @@ * */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor1" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -114,7 +114,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor1=v37-1" #define MTDPARTS_DEFAULT "mtdparts=v37-1:-(jffs2)" */ diff --git a/include/configs/vct.h b/include/configs/vct.h index 391535ed2ce..5371e2d7f61 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -286,7 +286,7 @@ int vct_gpio_get(int pin); #define CONFIG_CMD_UBI #define CONFIG_RBTREE #define CONFIG_MTD_PARTITIONS -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "onenand0=onenand" #define MTDPARTS_DEFAULT "mtdparts=onenand:128k(u-boot)," \ diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 7b61c82af3d..021012d0f95 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -225,7 +225,7 @@ /*----------------------------------------------------------------------- * Dynamic MTD partition support */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 f4606102a99..cadd90633da 100644 --- a/include/configs/voiceblue.h +++ b/include/configs/voiceblue.h @@ -189,7 +189,7 @@ /* * JFFS2 partitions (mtdparts command line support) */ -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #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 e7daa0771ec..e3ea84b3159 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -41,7 +41,7 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_JFFS2 -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #undef CONFIG_CMD_SPI #undef CONFIG_CMD_I2C #undef CONFIG_CMD_DTT @@ -108,7 +108,7 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_CMD_JFFS2 -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #else #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h index 6761438656e..5d13f9682e7 100644 --- a/include/configs/xsengine.h +++ b/include/configs/xsengine.h @@ -62,7 +62,7 @@ * JFFS2 partitions */ /* No command line, one static partition, whole device */ -#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_MTDPARTS #define CONFIG_JFFS2_DEV "nor0" #define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF #define CONFIG_JFFS2_PART_OFFSET 0x00000000 @@ -70,7 +70,7 @@ /* mtdparts command line support */ /* Note: fake mtd_id used, no linux mtd map file */ /* -#define CONFIG_JFFS2_CMDLINE +#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=xsengine-0" #define MTDPARTS_DEFAULT "mtdparts=xsengine-0:256k(uboot),1m(kernel1),8m(kernel2)" */ |