Skip to contentSkip to conversation

Fix help text of ext2load and fatload.

PATCH In review Pavel Machek 3 participants 6 messages Jul 9, 2014 – Jul 22, 2014

lore
Share & tools
lore

Pavel Machek

author
#0 lore raw

PATCH 1/1 Fix help text of ext2load and fatload.

Fix help text of ext2load and fatload to match code in fs/fs.c

Signed-off-by Pavel Machek <[email protected]>
common/cmd_ext2.c +1 -1
index 5a4bcc1..2675ae8 100644
@@ -45,7 +45,7 @@ U_BOOT_CMD(
 U_BOOT_CMD(
 	ext2load,	6,	0,	do_ext2load,
 	"load binary file from a Ext2 filesystem",
-	"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
+	"<interface> [<dev[:part]> [addr [filename [bytes [pos]]]]]\n"
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
 	"      to address 'addr' from ext2 filesystem."
 );
common/cmd_fat.c +1 -1
index a12d8fa..b7e743a 100644
@@ -26,7 +26,7 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
 	fatload,	7,	0,	do_fat_fsload,
 	"load binary file from a dos filesystem",
-	"<interface> [<dev[:part]>]  <addr> <filename> [bytes [pos]]\n"
+	"<interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]]\n"
 	"    - Load binary file 'filename' from 'dev' on 'interface'\n"
 	"      to address 'addr' from dos filesystem.\n"
 	"      'pos' gives the file position to start loading from.\n"
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#1 lore raw

PATCH 1/1 Fix help text of ext2load and fatload.

Quoted 1 line · Pavel Machek

Fix help text of ext2load and fatload to match code in fs/fs.c

Which code in fs/fs.c do you mean? Are you referring to do_load() ?

Reviewed-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut

author
#2 lore raw

PATCH 1/1 Fix help text of ext2load and fatload.

Quoted 4 lines · Marek Vasut
Quoted 1 line · Pavel Machek

Fix help text of ext2load and fatload to match code in fs/fs.c

Which code in fs/fs.c do you mean? Are you referring to do_load() ?

Yes, do_load.

Quoted 1 line
Reviewed-by Marek Vasut <[email protected]>

Thanks!
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#3 lore raw

PATCH 1/1 Fix help text of ext2load and fatload.

In reply to Pavel Machek
Quoted 10 lines · Pavel Machek

Fix help text of ext2load and fatload to match code in fs/fs.c

Signed-off-by Pavel Machek <[email protected]>
common/cmd_ext2.c +0 -0
index 5a4bcc1..2675ae8 100644

common/cmd_ext2.c U_BOOT_CMD( · line 48

Quoted 5 lines
common/cmd_ext2.c +1 -1
@@ -45,7 +45,7 @@ U_BOOT_CMD(
 U_BOOT_CMD(
 	ext2load,	6,	0,	do_ext2load,
 	"load binary file from a Ext2 filesystem",
-	"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
+	"<interface> [<dev[:part]> [addr [filename [bytes [pos]]]]]\n"

Wait, what? [] is optional, <> is mandatory. With the rest of the related patches I see you fix a problem about assuming addr but we still have to pass along a dev at least, yes?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140714/55183982/attachment.pgp>
author
#4 lore raw

PATCH 1/1 Fix help text of ext2load and fatload.

Quoted 6 lines · Tom Rini
Quoted 5 lines · Pavel Machek

Fix help text of ext2load and fatload to match code in fs/fs.c

Signed-off-by Pavel Machek <[email protected]>
Quoted 14 lines

common/cmd_ext2.c U_BOOT_CMD( · line 48

Quoted 10 lines
common/cmd_ext2.c +1 -1
index 5a4bcc1..2675ae8 100644
@@ -45,7 +45,7 @@ U_BOOT_CMD(
 U_BOOT_CMD(
 	ext2load,	6,	0,	do_ext2load,
 	"load binary file from a Ext2 filesystem",
-	"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
+	"<interface> [<dev[:part]> [addr [filename [bytes [pos]]]]]\n"

Wait, what? [] is optional, <> is mandatory. With the rest of the related patches I see you fix a problem about assuming addr but we still have to pass along a dev at least, yes?

Do we?

fs/fs.c:

        if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype))
		return 1;

This tries to handle case where interface is specified but dev is not. Aha, and it seems to use bootdevice environment variable if device is not specified (and also "hostfs" does not use bootdevice).

SOCFPGA_CYCLONE5 # setenv bootdevice 0:1
SOCFPGA_CYCLONE5 # fatload mmc
** Bad device mmc 0 **

(In older u-boots, bootdevice is indeed mandatory. And clearly I should get recent u-boot with mmc support; working on that.).

IOW I think the patch is correct as-is.

Best regards,
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#5 lore raw
In reply to Pavel Machek
Quoted 4 lines · Pavel Machek

Fix help text of ext2load and fatload to match code in fs/fs.c

Signed-off-by Pavel Machek <[email protected]>
Reviewed-by Marek Vasut <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140722/96cca4d7/attachment.pgp>