Skip to contentSkip to conversation

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

PATCH New Alexander Stein 3 participants 3 messages Aug 11, 2010 – Oct 12, 2010

lore
Share & tools
lore

Alexander Stein

author
#0 lore raw

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

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

Signed-off-by Alexander Stein <[email protected]>
---
 common/cmd_flash.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
common/cmd_flash.c +6 -6
index ff43965..3e6bab2 100644
@@ -31,7 +31,7 @@
 #include <dataflash.h>
 #endif
 
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
+#if defined(CONFIG_CMD_MTDPARTS)
 #include <jffs2/jffs2.h>
 
 /* partition handling routines */

@@ -325,7 +325,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	flash_info_t *info;
 	ulong bank, addr_first, addr_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 part_info *part;
 	u8 dev_type, dev_num, pnum;

@@ -355,7 +355,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		return rcode;
 	}
 
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
+#if defined(CONFIG_CMD_MTDPARTS)
 	/* erase <part-id> - erase partition */
 	if ((argc == 2) && (mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
 		mtdparts_init();

@@ -465,7 +465,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)
 	ulong addr_first, addr_last;
 #endif
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
+#if defined(CONFIG_CMD_MTDPARTS)
 	struct mtd_device *dev;
 	struct part_info *part;
 	u8 dev_type, dev_num, pnum;

@@ -555,7 +555,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		return rcode;
 	}
 
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
+#if defined(CONFIG_CMD_MTDPARTS)
 	/* protect on/off <part-id> */
 	if ((argc == 3) && (mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
 		mtdparts_init();

@@ -687,7 +687,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_PROT_ON	"protect on <part-id>\n    - protect partition\n"
 # define TMP_PROT_OFF	"protect off <part-id>\n    - make partition writable\n"
Signature · 1 line
1.7.1
#1 lore raw

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

Quoted 3 lines · On Wednesday 11 August 2010 16:48:04 Alexander Stein wrote:

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

Signed-off-by Alexander Stein <[email protected]>

Looks good, so:

Acked-by Stefan Roese <[email protected]>

Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de

Applied
#2 lore raw

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

In reply to Alexander Stein

Dear Alexander Stein,

Quoted 6 lines · In message <1281538084-10062-1-git-send-email-alexander.stein@systec-electronic…

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

Signed-off-by Alexander Stein <[email protected]>
---
 common/cmd_flash.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The first thing we do is kill all the lawyers.
(Shakespeare. II Henry VI, Act IV, scene ii)