On Mon, Jul 07, 2014 at 05:36:33AM -0400, Robert P. J. Day wrote:
>
> Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
>
> ---
>
> as i understand it, this fix should take care of the command being
> named "crc32", is that right? it seems to generate the correct sphinx
> documentation.
>
> diff --git a/Documentation/user/memory-areas.rst b/Documentation/user/memory-areas.rst
> index 6c5bab3..9654a99 100644
> --- a/Documentation/user/memory-areas.rst
> +++ b/Documentation/user/memory-areas.rst
> @@ -2,7 +2,7 @@ Memory areas
> ============
>
> Several barebox commands like :ref:`command_md`, :ref:`command_erase`
> -or :ref:`command_crc` work on an area of memory. Areas have the following form::
> +or :ref:`command_crc32` work on an area of memory. Areas have the following form::
>
> <start>-<end>
>
> diff --git a/commands/crc.c b/commands/crc.c
> index 3612162..0e30052 100644
> --- a/commands/crc.c
> +++ b/commands/crc.c
> @@ -107,7 +107,7 @@ static int do_crc(int argc, char *argv[])
> return err;
> }
>
> -BAREBOX_CMD_HELP_START(crc)
> +BAREBOX_CMD_HELP_START(crc32)
> BAREBOX_CMD_HELP_TEXT("Calculate a CRC32 checksum of a memory area.")
> BAREBOX_CMD_HELP_TEXT("")
> BAREBOX_CMD_HELP_TEXT("Options:")
Damn, I pushed this to master without compile testing. Needs this fixup:
-----------------------------8<----------------------------
>From 3f4e7adae9365aa08b5f87355bbb2ba370961304 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Tue, 8 Jul 2014 10:52:55 +0200
Subject: [PATCH] Fix crc32 compile error
This fixes a compile error introduced with:
| commit 37f47a2a8c2dba420a849625b2926dacdc23cf49
| Author: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
| Date: Mon Jul 7 05:36:33 2014 -0400
|
| crc32: Proper name of command is "crc32".
|
| Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
| Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
commands/crc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/commands/crc.c b/commands/crc.c
index 0e30052..7c2936c 100644
--- a/commands/crc.c
+++ b/commands/crc.c
@@ -128,5 +128,5 @@ BAREBOX_CMD_START(crc32)
#endif
"vV] AREA")
BAREBOX_CMD_GROUP(CMD_GRP_MEM)
- BAREBOX_CMD_HELP(cmd_crc_help)
+ BAREBOX_CMD_HELP(cmd_crc32_help)
BAREBOX_CMD_END
--
2.0.0
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
