Add NAND support to DFU, enable for am335x_evm
Subsystems (2)
v4 cover Add NAND support to DFU, enable for am335x_evm
This series adds DFU support to NAND and was started by Pantelis. The NAND changes have been compile-tested on all ARM and PowerPC targets and run-time tested on ARM. DFU itself has been tested, for NAND, on am335x_evm.
For practical reasons, this series depends on Pantelis' previous series of generic DFU changes. Lukasz and I are discussing how to handle a few changes there since one of them breaks file writing.
--
Tom
Changes in v4:
- Further reword nand_util.c comments, from Scott
- In nand_write_skip_bad make sure *actual is 0 for YAFFS2 errors too, reminded by Scott.
- In cmd_nand.c don't drop the size is less than maxsize check in arg_off_size as other nand functions need this still (Scott).
- Add patch to fix CONFIG_CMD_NAND_YAFFS
Changes in v3:
- Reworked skip_check_len changes to just add accounting for *used to the logic.
- Allow for actual to be NULL in nand_(read|write)_skip_bad, only DFU calls this with a non-NULL parameter. Make sure the comments for both functions explain the parameters and their behavior.
- Other style changes requested by Scott.
- As nand_(write|read)_skip_bad passes back just a used length now.
- Rework logic in nand_block_op for nand_(read|write)_skip_bad returning just a size for actual used length.
- Remove unused externs from drivers/dfu/dfu_nand.c
- Fix checkpatch.pl warnings in include/configs/am335x_evm.h
Changes in v2:
- NAND skip_check_len changes reworked to allow nand_(read|write)_skip_bad to return this information to the caller.
- nand_block_op calls nand_(read|write)_skip_bad directly.
- Bugfix in dfu_nand to make sure we set dfu->skip_bad to 0 on each iteration.
- Add CONFIG_CMD_MTDPARTS and relevant information to am335x_evm
- Enable DFU for NAND and MMC, set dfu_alt_info_(nand|mmc) as examples for both in am335x_evm.h
- Increase CONFIG_SYS_MAXARGS due to hush parsing bugs that would otherwise prevent 'setenv dfu_alt_info ${dfu_alt_info_nand}' on am335x_evm
Pantelis Antoniou (2):
dfu: NAND specific routines for DFU operation
am335x_evm: Enable DFU for NAND and MMC, provide example alt_info for
both
Tom Rini (3):
nand: Extend nand_(read|write)_skip_bad with *actual and limit
parameters
cmd_nand.c: Fix CONFIG_CMD_NAND_YAFFS
am335x_evm: Add CONFIG_CMD_MTDPARTS and relevant defaults
common/cmd_nand.c | 55 +++++++----- common/env_nand.c | 3 +- drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 8 ++ drivers/dfu/dfu_nand.c | 195 ++++++++++++++++++++++++++++++++++++++++++ drivers/mtd/nand/nand_util.c | 68 +++++++++++++-- include/configs/am335x_evm.h | 47 +++++++++- include/dfu.h | 23 +++++ include/nand.h | 4 +- 9 files changed, 368 insertions(+), 36 deletions(-) create mode 100644 drivers/dfu/dfu_nand.c
Signature · 1 line
1.7.9.5
PATCH v4 1/5 nand: Extend nand_(read|write)_skip_bad with *actual and limit parameters
We make these two functions take a size_t pointer to how much space was used on NAND to read or write the buffer (when reads/writes happen) so that bad blocks can be accounted for. We also make them take an loff_t limit on how much data can be read or written. This means that we can now catch the case of when writing to a partition would exceed the partition size due to bad blocks. To do this we also need to make check_skip_len count not just complete blocks used but partial ones as well. All callers of nand_(read|write)_skip_bad are adjusted to call these with the most sensible limits available.
The changes were started by Pantelis and finished by Tom.
---
Changes in v4:
- Further reword nand_util.c comments, from Scott
- In nand_write_skip_bad make sure *actual is 0 for YAFFS2 errors too, reminded by Scott.
- In cmd_nand.c don't drop the size is less than maxsize check in arg_off_size as other nand functions need this still (Scott).
Changes in v3:
- Reworked skip_check_len changes to just add accounting for *used to the logic.
- Allow for actual to be NULL in nand_(read|write)_skip_bad, only DFU calls this with a non-NULL parameter. Make sure the comments for both functions explain the parameters and their behavior.
- Other style changes requested by Scott.
- As nand_(write|read)_skip_bad passes back just a used length now.
Changes in v2:
- NAND skip_check_len changes reworked to allow nand_(read|write)_skip_bad to return this information to the caller.
common/cmd_nand.c | 53 ++++++++++++++++++-------------- common/env_nand.c | 3 +- drivers/mtd/nand/nand_util.c | 68 +++++++++++++++++++++++++++++++++++++----- include/nand.h | 4 +-- 4 files changed, 95 insertions(+), 33 deletions(-)
common/cmd_nand.c +31 -22
@@ -137,7 +137,8 @@ static inline int str2long(const char *p, ulong *num)return *p !='\0' && *endptr =='\0' ; } -static int get_part (const char *partname,int *idx,loff_t *off,loff_t *size) +static int get_part (const char *partname,int *idx,loff_t *off,loff_t *size, +loff_t *maxsize) {#ifdef CONFIG_CMD_MTDPARTS struct mtd_device *dev;
@@ -160,6 +161,7 @@ static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size) *off = part->offset; *size = part->size; + *maxsize = part->size; *idx = dev->id->num; ret =set_dev (*idx);
@@ -173,10 +175,11 @@ static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size)#endif } -static int arg_off (const char *arg,int *idx,loff_t *off,loff_t *maxsize) +static int arg_off (const char *arg,int *idx,loff_t *off,loff_t *size, +loff_t *maxsize) {if (!str2off (arg, off)) -return get_part (arg, idx, off, maxsize); +return get_part (arg, idx, off, size, maxsize);if (*off >= nand_info[*idx].size) {puts ("Offset exceeds device limit\n" );
@@ -184,36 +187,35 @@ static int arg_off(const char *arg, int *idx, loff_t *off, loff_t *maxsize) } *maxsize = nand_info[*idx].size - *off; + *size = *maxsize;return 0 ; }static int arg_off_size (int argc,char *const argv[],int *idx, -loff_t *off,loff_t *size) +loff_t *off,loff_t *size,loff_t *maxsize) {int ret; -loff_t maxsize =0 ;if (argc ==0 ) { *off =0 ; *size = nand_info[*idx].size; + *maxsize = *size; goto print; } - ret =arg_off (argv[0 ], idx, off, &maxsize); + ret =arg_off (argv[0 ], idx, off, size, maxsize);if (ret)return ret; -if (argc ==1 ) { - *size = maxsize; +if (argc ==1 ) goto print; - }if (!str2off (argv[1 ], size)) {printf ("'%s' is not a number\n" , argv[1 ]);return -1 ; } -if (*size > maxsize) { +if (*size > *maxsize) {puts ("Size exceeds partition or device limit\n" );return -1 ; }
@@ -307,7 +309,8 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, int argc, char *const argv[])if (argc <3 ) goto usage; -if (arg_off (argv[2 ], &idx, &addr, &maxsize)) { +/* We don't care about size, or maxsize. */ +if (arg_off (argv[2 ], &idx, &addr, &maxsize, &maxsize)) {puts ("Offset or partition name expected\n" );return 1 ; }
@@ -426,7 +429,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {int i, ret =0 ;ulong addr; -loff_t off, size; +loff_t off, size, maxsize;char *cmd, *s;nand_info_t *nand;#ifdef CONFIG_SYS_NAND_QUIET
@@ -551,7 +554,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])printf ("\nNAND %s: " , cmd);/* skip first two or three arguments, look for offset and size */ -if (arg_off_size (argc - o, argv + o, &dev, &off, &size) !=0 ) +if (arg_off_size (argc - o, argv + o, &dev, &off, &size, + &maxsize) !=0 )return 1 ; nand = &nand_info[dev];
@@ -619,7 +623,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (s && !strcmp (s,".raw" )) { raw =1 ; -if (arg_off (argv[3 ], &dev, &off, &size)) +if (arg_off (argv[3 ], &dev, &off, &size, &maxsize))return 1 ;if (argc >4 && !str2long (argv[4 ], &pagecount)) {
@@ -635,7 +639,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) rwsize = pagecount * (nand->writesize + nand->oobsize); }else {if (arg_off_size (argc -3 , argv +3 , &dev, - &off, &size) !=0 ) + &off, &size, &maxsize) !=0 )return 1 ; rwsize = size;
@@ -645,9 +649,11 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) !strcmp(s, ".e") || !strcmp(s, ".i")) {if (read) ret =nand_read_skip_bad (nand, off, &rwsize, +NULL , maxsize, (u_char *)addr);else ret =nand_write_skip_bad (nand, off, &rwsize, +NULL , maxsize, (u_char *)addr,0 ); #ifdef CONFIG_CMD_NAND_TRIMFFS } else if (!strcmp(s, ".trimffs")) {
@@ -655,8 +661,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])printf ("Unknown nand command suffix '%s'\n" , s); return 1; } - ret =nand_write_skip_bad (nand, off, &rwsize, - (u_char *)addr, + ret =nand_write_skip_bad (nand, off, &rwsize,NULL , + maxsize, (u_char *)addr,WITH_DROP_FFS );#endif #ifdef CONFIG_CMD_NAND_YAFFS
@@ -665,8 +671,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])printf ("Unknown nand command suffix '%s'.\n" , s); return 1; } - ret =nand_write_skip_bad (nand, off, &rwsize, - (u_char *)addr, + ret =nand_write_skip_bad (nand, off, &rwsize,NULL , + maxsize, (u_char *)addr,WITH_INLINE_OOB );#endif }else if (!strcmp (s,".oob" )) {
@@ -775,7 +781,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (s && !strcmp (s,".allexcept" )) allexcept =1 ; -if (arg_off_size (argc -2 , argv +2 , &dev, &off, &size) <0 ) +if (arg_off_size (argc -2 , argv +2 , &dev, &off, &size, + &maxsize) <0 )return 1 ;if (!nand_unlock (&nand_info[dev], off, size, allexcept)) {
@@ -873,7 +880,8 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,printf ("\nLoading from %s, offset 0x%lx\n" , nand->name, offset); cnt = nand->writesize; - r =nand_read_skip_bad (nand, offset, &cnt, (u_char *) addr); + r =nand_read_skip_bad (nand, offset, &cnt,NULL , nand->size, + (u_char *) addr);if (r) {puts ("** Read error\n" );bootstage_error (BOOTSTAGE_ID_NAND_HDR_READ );
@@ -905,7 +913,8 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, }bootstage_mark (BOOTSTAGE_ID_NAND_TYPE ); - r =nand_read_skip_bad (nand, offset, &cnt, (u_char *) addr); + r =nand_read_skip_bad (nand, offset, &cnt,NULL , nand->size, + (u_char *) addr);if (r) {puts ("** Read error\n" );bootstage_error (BOOTSTAGE_ID_NAND_READ );
common/env_nand.c +2 -1
@@ -281,7 +281,8 @@ int readenv(size_t offset, u_char *buf) }else { char_ptr = &buf[amount_loaded];if (nand_read_skip_bad (&nand_info[0 ], offset, - &len, char_ptr)) + &len,NULL , + nand_info[0 ].size, char_ptr))return 1 ; offset += blocksize;
drivers/mtd/nand/nand_util.c +60 -8
151 lines not on this page · raw message
include/nand.h +2 -2
@@ -129,7 +129,7 @@ struct nand_erase_options {typedef struct nand_erase_options nand_erase_options_t ;int nand_read_skip_bad (nand_info_t *nand,loff_t offset,size_t *length, -u_char *buffer); +size_t *actual,loff_t lim,u_char *buffer);#define WITH_YAFFS_OOB (1 << 0)/* whether write with yaffs format. This flag * is a 'mode' meaning it cannot be mixed with
@@ -137,7 +137,7 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,#define WITH_DROP_FFS (1 << 1)/* drop trailing all-0xff pages */ int nand_write_skip_bad (nand_info_t *nand,loff_t offset,size_t *length, -u_char *buffer,int flags); +size_t *actual,loff_t lim,u_char *buffer,int flags);int nand_erase_opts (nand_info_t *meminfo,const nand_erase_options_t *opts);int nand_torture (nand_info_t *nand,loff_t offset);
Signature · 1 line
1.7.9.5
PATCH v4 2/5 cmd_nand.c: Fix CONFIG_CMD_NAND_YAFFS
In reply to Tom RiniThe flag changed from WITH_INLINE_OOB to WITH_YAFFS_OOB by accident in 418396e.
---
Changes in v4:
- Add patch to fix CONFIG_CMD_NAND_YAFFS
Changes in v3: None
Changes in v2: None
common/cmd_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/cmd_nand.c +1 -1
@@ -673,7 +673,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } ret =nand_write_skip_bad (nand, off, &rwsize,NULL , maxsize, (u_char *)addr, -WITH_INLINE_OOB ); +WITH_YAFFS_OOB );#endif }else if (!strcmp (s,".oob" )) {/* out-of-band data */
Signature · 1 line
1.7.9.5
PATCH v4 2/5 cmd_nand.c: Fix CONFIG_CMD_NAND_YAFFS
Quoted 19 lines · Tom Rini
The flag changed from
WITH_INLINE_OOBtoWITH_YAFFS_OOBby accident in 418396e.Signed-off-by Tom Rini <[email protected]>---
Changes in v4:
- Add patch to fixCONFIG_CMD_NAND_YAFFSChanges in v3: None
Changes in v2: Nonecommon/cmd_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/cmd_nand.c +0
-0
common/cmd_nand.c static int do_nand(cmd_tbl_t *cmdtp, int flag, · line 679
Quoted 8 lines
common/cmd_nand.c +1
-1@@ -673,7 +673,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } ret =nand_write_skip_bad (nand, off, &rwsize,NULL , maxsize, (u_char *)addr, -WITH_INLINE_OOB ); +WITH_YAFFS_OOB );#endif
Oops. Probably a leftover from an attempt to share code between yaffs and raw accesses.
BTW, it looks like there is no board that selects CONFIG_CMD_NAND_YAFFS, so it doesn't get compile tested... ...and smdk6400 defines CONFIG_SYS_NAND_YAFFS_WRITE, which nothing ever tests. :-P
-Scott
PATCH v4 2/5 cmd_nand.c: Fix CONFIG_CMD_NAND_YAFFS
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 24 lines · Scott Wood
Quoted 12 lines · Tom Rini
The flag changed from
WITH_INLINE_OOBtoWITH_YAFFS_OOBby accident in 418396e.Signed-off-by Tom Rini <[email protected]> --- Changes in v4: - Addpatch to fix
CONFIG_CMD_NAND_YAFFSChanges in v3: None Changes in v2: None
common/cmd_nand.c| 2 +- 1 file changed, 1 insertion(+), 1
deletion(-)common/cmd_nand.c index renamed from common/cmd_nand.c +0
-0Quoted 7 lines
76f4d3f..d9010d2 100644 ---
a/common/cmd_nand.c+++b/common/cmd_nand.c@@ -673,7 +673,7 @@ static intdo_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])} ret = nand_write_skip_bad(nand, off, &rwsize, NULL, maxsize, (u_char*)addr, -WITH_INLINE_OOB); +WITH_YAFFS_OOB);
#endifOops. Probably a leftover from an attempt to share code between yaffs and raw accesses.
Quoted 4 lines
BTW, it looks like there is no board that selects
CONFIG_CMD_NAND_YAFFS, so it doesn't get compile tested... ...and smdk6400 definesCONFIG_SYS_NAND_YAFFS_WRITE, which nothing ever tests. :-P
Indeed. We lack some real users of YAFFS in U-Boot right now, and I don't wish to open a can of worms on why that might be.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRNUoMAAoJENk4IS6UOR1WH0IP/j0MPShdroqdmLXZKkG5wFOv yhg2hiXYGQU9eruBC0poGbPNQxaUA68rWwBe770f+S++ovpNQ3jORS/1I6OdpUqt c0EMcnY2GHCVP6Ct5lrqccif9SC0q0vueMqd2agErnkPZzfkKFFsyPkfAIoXIWcD vl8gA9yGpRP0GpIbN25Ow0WmV/cgyQzorwuwZPdQQ52jFKCH+g12YvdTdBG1nB70 ZZS79pKMy49YdSElTROb2WbfBU2j8kNK4FlOXoR+5wea6t6ejDr40WTFlqY+IU7E AYegnYNQcYcAq/yENKcTE6py7j94kDclVp5L+1aUpyZmsFNOP44BcGDIkubQAWR5 Cp9FRtRC2PEBOUTZv/3GDbn9OogIxqlKOwSbAj4A977bBT965IVZZoNS68hAOQph vTf1umSQQXqUjybPyhcCH3hDeULXjKkjj+Vi5pgwoBM28IRmbhBm68aSLX1FZL2x waWVsGa1J8bd96ZWZ6ML5vB9dUpdywW/tFOvPMkNyj43ugHEmaJ8EXdTB2H+1B+f b0tkCaMwU+Qd0kFlfIyEseR8QbG5K6ngZDCUtcw7LKQy+vC7YfaH6kx8sXaSdg4J QKNCqoQ+6uk6EfYJkVtK4NJTojRmu+jVTjv2Yne2if1uhYs7f04S1NZlqCmAUNAl QUU7sJ97JECLYDFITqBC
=MFnf
-----END PGP SIGNATURE-----
PATCH v4 2/5 cmd_nand.c: Fix CONFIG_CMD_NAND_YAFFS
Quoted 28 lines · Tom Rini
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 24 lines · Scott Wood
Quoted 12 lines · Tom Rini
The flag changed from
WITH_INLINE_OOBtoWITH_YAFFS_OOBby accident in 418396e.Signed-off-by Tom Rini <[email protected]> --- Changes in v4: - Addpatch to fix
CONFIG_CMD_NAND_YAFFSChanges in v3: None Changes in v2: None
common/cmd_nand.c| 2 +- 1 file changed, 1 insertion(+), 1
deletion(-)common/cmd_nand.c index renamed from common/cmd_nand.c +0
-0Quoted 7 lines
76f4d3f..d9010d2 100644 ---
a/common/cmd_nand.c+++b/common/cmd_nand.c@@ -673,7 +673,7 @@ static intdo_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])} ret = nand_write_skip_bad(nand, off, &rwsize, NULL, maxsize, (u_char*)addr, -WITH_INLINE_OOB); +WITH_YAFFS_OOB);
#endifOops. Probably a leftover from an attempt to share code between yaffs and raw accesses.
Quoted 7 lines
Quoted 4 lines
BTW, it looks like there is no board that selects
CONFIG_CMD_NAND_YAFFS, so it doesn't get compile tested... ...and smdk6400 definesCONFIG_SYS_NAND_YAFFS_WRITE, which nothing ever tests. :-PIndeed. We lack some real users of YAFFS in U-Boot right now, and I don't wish to open a can of worms on why that might be.
I see some other things in nand_write_skip_bad() that look broken for WITH_YAFFS_OOB (but have been there since before WITH_YAFFS_OOB was introduced...), in particular check_skip_len() and the call to nand_write() when need_skip is 0.
Sorry if some worms just popped out. :-)
-Scott
PATCH v4 3/5 dfu: NAND specific routines for DFU operation
In reply to Tom RiniFrom: Pantelis Antoniou <[email protected]>
Support for NAND storage devices to work with the DFU framework.
---
Changes in v4: None
Changes in v3:
- Rework logic in nand_block_op for nand_(read|write)_skip_bad returning just a size for actual used length.
- Remove unused externs from drivers/dfu/dfu_nand.c
Changes in v2:
- nand_block_op calls nand_(read|write)_skip_bad directly.
- Bugfix in dfu_nand to make sure we set dfu->skip_bad to 0 on each iteration.
drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 8 ++ drivers/dfu/dfu_nand.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 23 ++++++ 4 files changed, 227 insertions(+) create mode 100644 drivers/dfu/dfu_nand.c
drivers/dfu/Makefile +1 -0
@@ -27,6 +27,7 @@ LIB = $(obj)libdfu.o COBJS-$(CONFIG_DFU_FUNCTION) += dfu.o COBJS-$(CONFIG_DFU_MMC) += dfu_mmc.o +COBJS-$(CONFIG_DFU_NAND) += dfu_nand.o SRCS := $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
drivers/dfu/dfu.c +8 -0
@@ -86,6 +86,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)/* initial state */ dfu->crc =0 ; dfu->offset =0 ; + dfu->bad_skip =0 ; dfu->i_blk_seq_num =0 ; dfu->i_buf_start = dfu_buf; dfu->i_buf_end = dfu_buf +sizeof (dfu_buf);
@@ -234,6 +235,8 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->i_buf = dfu->i_buf_start; dfu->b_left =0 ; + dfu->bad_skip =0 ; + dfu->inited =1 ; }
@@ -263,6 +266,8 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->i_buf = dfu->i_buf_start; dfu->b_left =0 ; + dfu->bad_skip =0 ; + dfu->inited =0 ; }
@@ -285,6 +290,9 @@ static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt,if (strcmp (interface,"mmc" ) ==0 ) {if (dfu_fill_entity_mmc (dfu, s))return -1 ; + }else if (strcmp (interface,"nand" ) ==0 ) { +if (dfu_fill_entity_nand (dfu, s)) +return -1 ; }else {printf ("%s: Device %s not (yet) supported!\n" , __func__, interface);
drivers/dfu/dfu_nand.c new file +195 -0
195 lines not on this page · raw message
include/dfu.h +23 -0
@@ -56,6 +56,15 @@ struct mmc_internal_data {unsigned int part; }; +struct nand_internal_data { +/* RAW programming */ +u64 start; +u64 size; + +unsigned int dev; +unsigned int part; +}; +static inline unsigned int get_mmc_blk_size (int dev) {return find_mmc_device (dev)->read_bl_len;
@@ -75,6 +84,7 @@ struct dfu_entity {union {struct mmc_internal_data mmc; +struct nand_internal_data nand; } data; int (*read_medium)(struct dfu_entity *dfu,
@@ -95,6 +105,8 @@ struct dfu_entity {long r_left;long b_left; +u32 bad_skip;/* for nand use */ + unsigned int inited : 1; };
@@ -119,4 +131,15 @@ static inline int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)return -1 ; }#endif + +#ifdef CONFIG_DFU_NAND +extern int dfu_fill_entity_nand (struct dfu_entity *dfu,char *s); +#else +static inline int dfu_fill_entity_nand (struct dfu_entity *dfu,char *s) +{ +puts ("NAND support not available!\n" ); +return -1 ; +} +#endif +#endif /* __DFU_ENTITY_H_ */
Signature · 1 line
1.7.9.5
PATCH v4 4/5 am335x_evm: Add CONFIG_CMD_MTDPARTS and relevant defaults
In reply to Tom Rini---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Add CONFIG_CMD_MTDPARTS and relevant information to am335x_evm
include/configs/am335x_evm.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/configs/am335x_evm.h +9 -0
@@ -60,6 +60,8 @@"fdtfile=\0" \"console=ttyO0,115200n8\0" \"optargs=\0" \ +"mtdids=" MTDIDS_DEFAULT "\0" \ +"mtdparts=" MTDPARTS_DEFAULT "\0" \"mmcdev=0\0" \"mmcroot=/dev/mmcblk0p2 ro\0" \"mmcrootfstype=ext4 rootwait\0" \
@@ -341,6 +343,13 @@/* NAND support */ #ifdef CONFIG_NAND #define CONFIG_CMD_NAND +#define CONFIG_CMD_MTDPARTS +#define MTDIDS_DEFAULT "nand0=omap2-nand.0" +#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \ + "128k(SPL.backup1)," \ + "128k(SPL.backup2)," \ + "128k(SPL.backup3),1920k(u-boot)," \ + "128k(u-boot-env),5m(kernel),-(rootfs)"#define CONFIG_NAND_OMAP_GPMC #define GPMC_NAND_ECC_LP_x16_LAYOUT 1#define CONFIG_SYS_NAND_BASE (0x08000000)/* physical address */
Signature · 1 line
1.7.9.5
PATCH v4 5/5 am335x_evm: Enable DFU for NAND and MMC, provide example alt_info for both
In reply to Tom RiniFrom: Pantelis Antoniou <[email protected]>
- Add CONFIG_DFU_NAND, CONFIG_DFU_MMC
- Set dfu_alt_info_nand and dfu_alt_info_mmc to show a working example for both.
- Increase CONFIG_SYS_MAXARGS due to hush parsing bugs that would otherwise disallow 'setenv dfu_alt_info ${dfu_alt_info_nand}'.
- Enable CONFIG_FAT_WRITE to allow updating on MMC
---
Changes in v4: None
Changes in v3:
- Fix checkpatch.pl warnings in include/configs/am335x_evm.h
Changes in v2:
- Enable DFU for NAND and MMC, set dfu_alt_info_(nand|mmc) as examples for both in am335x_evm.h
- Increase CONFIG_SYS_MAXARGS due to hush parsing bugs that would otherwise prevent 'setenv dfu_alt_info ${dfu_alt_info_nand}' on am335x_evm
include/configs/am335x_evm.h | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
include/configs/am335x_evm.h +36 -2
@@ -62,6 +62,8 @@"optargs=\0" \"mtdids=" MTDIDS_DEFAULT "\0" \"mtdparts=" MTDPARTS_DEFAULT "\0" \ +"dfu_alt_info_mmc=" DFU_ALT_INFO_MMC "\0" \ +"dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \"mmcdev=0\0" \"mmcroot=/dev/mmcblk0p2 ro\0" \"mmcrootfstype=ext4 rootwait\0" \
@@ -118,8 +120,8 @@#define CONFIG_CMD_ECHO -/* max number of command args */ -#define CONFIG_SYS_MAXARGS 16 +/* We set the max number of command args high to avoid HUSH bugs. */ +#define CONFIG_SYS_MAXARGS 64/* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 512
@@ -148,6 +150,7 @@#define CONFIG_CMD_MMC #define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE #define CONFIG_CMD_EXT2 #define CONFIG_SPI
@@ -158,6 +161,36 @@#define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED (24000000) +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USB_GADGET +#define CONFIG_USBDOWNLOAD_GADGET + +/* USB TI's IDs */ +#define CONFIG_USBD_HS +#define CONFIG_G_DNL_VENDOR_NUM 0x0403 +#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 +#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" + +/* USB Device Firmware Update support */ +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_DFU_NAND +#define CONFIG_CMD_DFU +#define DFU_ALT_INFO_MMC \ + "boot part 0 1;" \ + "rootfs part 0 2;" \ + "MLO fat 0 1;" \ + "u-boot.img fat 0 1;" \ + "uEnv.txt fat 0 1" +#define DFU_ALT_INFO_NAND \ + "SPL part 0 1;" \ + "SPL.backup1 part 0 2;" \ + "SPL.backup2 part 0 3;" \ + "SPL.backup3 part 0 4;" \ + "u-boot part 0 5;" \ + "kernel part 0 7;" \ + "rootfs part 0 8" +/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1/* 1 bank of DRAM */ #define PHYS_DRAM_1 0x80000000/* DRAM Bank #1 */
@@ -302,6 +335,7 @@#define CONFIG_MUSB_GADGET #define CONFIG_MUSB_PIO_ONLY #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2#define CONFIG_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
Signature · 1 line
1.7.9.5