Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CONFIG_CMD_JFFS2 is not necessary to use mtdparts on erase & protect on/off

Browse source 
The include <jffs2/jffs2.h> is still necessary though.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Acked-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Alexander Stein 2010-08-11 16:48:04 +02:00 • committed by Wolfgang Denk
parent c0c3590bb2
commit c000808b6a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/cmd_flash.c
View file

@ -31,7 +31,7 @@
#include <dataflash.h> #include <dataflash.h>
#endif #endif
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) #if defined(CONFIG_CMD_MTDPARTS)
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
/* partition handling routines */ /* partition handling routines */
@ -327,7 +327,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
flash_info_t *info; flash_info_t *info;
ulong bank, addr_first, addr_last; ulong bank, addr_first, addr_last;
int n, sect_first, sect_last; int n, sect_first, sect_last;
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) #if defined(CONFIG_CMD_MTDPARTS)
struct mtd_device *dev; struct mtd_device *dev;
struct part_info *part; struct part_info *part;
u8 dev_type, dev_num, pnum; u8 dev_type, dev_num, pnum;
@ -357,7 +357,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return rcode; return rcode;
} }
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) #if defined(CONFIG_CMD_MTDPARTS)
/* erase <part-id> - erase partition */ /* erase <part-id> - erase partition */
if ((argc == 2) && (mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) { if ((argc == 2) && (mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
mtdparts_init(); mtdparts_init();
@ -463,7 +463,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH) #if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH)
ulong addr_first, addr_last; ulong addr_first, addr_last;
#endif #endif
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) #if defined(CONFIG_CMD_MTDPARTS)
struct mtd_device *dev; struct mtd_device *dev;
struct part_info *part; struct part_info *part;
u8 dev_type, dev_num, pnum; u8 dev_type, dev_num, pnum;
@ -553,7 +553,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return rcode; return rcode;
} }
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) #if defined(CONFIG_CMD_MTDPARTS)
/* protect on/off <part-id> */ /* protect on/off <part-id> */
if ((argc == 3) && (mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) { if ((argc == 3) && (mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
mtdparts_init(); mtdparts_init();
@ -681,7 +681,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
/**************************************************/ /**************************************************/
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS) #if defined(CONFIG_CMD_MTDPARTS)
# define TMP_ERASE "erase <part-id>\n - erase partition\n" # define TMP_ERASE "erase <part-id>\n - erase partition\n"
# define TMP_PROT_ON "protect on <part-id>\n - protect partition\n" # define TMP_PROT_ON "protect on <part-id>\n - protect partition\n"
# define TMP_PROT_OFF "protect off <part-id>\n - make partition writable\n" # define TMP_PROT_OFF "protect off <part-id>\n - make partition writable\n"